[bug#58654] [PATCH 0/3] add velox

[bug#58654] [PATCH 0/3] add velox

[zamfofex]

I was planning to add only swc, but it seems velox was easy enough to add too.

zamfofex (3):
  gnu: Add wld.
  gnu: Add swc.
  gnu: Add velox.

 gnu/packages/wm.scm | 114 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 114 insertions(+)

-- 
2.38.0

[bug#58657] [PATCH 1/3] gnu: Add wld.

[zamfofex]

* gnu/packages/wm.scm (wld): New variable.
---
 gnu/packages/wm.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index af406ed2ed..94dfd28f4a 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -58,6 +58,7 @@
 ;;; Copyright © 2022 Elais Player <elais@fastmail.com>
 ;;; Copyright © 2022 Trevor Richards <trev@trevdev.ca>
 ;;; Copyright © 2022 Fredrik Salomonsson <plattfot@posteo.net>
+;;; Copyright © 2022 zamfofex <zamfofex@twdb.moe>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2931,3 +2932,37 @@ (define-public grimshot
 an interface over @code{grim}, @code{slurp} and @code{jq}, and supports storing
 the screenshot either directly to the clipboard using @code{wl-copy} or to a
 file.")))
+
+(define-public wld
+  (let ((commit "6586736176ef50a88025abae835e29a7ca980126")
+        (revision "1"))
+    (package
+      (name "wld")
+      (version (git-version "0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                       (url "https://github.com/michaelforney/wld")
+                       (commit commit)))
+                (sha256
+                  (base32
+                    "0qkd3q8p1s72x688g83fkcarrz2h20904rpd8z44ql6ksgrj9bp3"))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:tests? #f ; no tests
+         #:make-flags
+         (list (string-append "CC=" ,(cc-for-target))
+               (string-append "PREFIX=" %output))
+         #:phases
+         (modify-phases %standard-phases
+           (delete 'configure))))
+      (inputs (list fontconfig
+                    libdrm
+                    pixman
+                    wayland))
+      (propagated-inputs (list fontconfig pixman))
+      (native-inputs (list pkg-config))
+      (home-page "https://github.com/michaelforney/wld")
+      (synopsis "A primitive drawing library targeted at Wayland")
+      (description "wld is a drawing library that targets Wayland.")
+      (license license:expat))))
-- 
2.38.0

bug#58657: [PATCH 1/3] gnu: Add wld.

[Ludovic Courtès]

Hi,

zamfofex <zamfofex@twdb.moe> skribis:

> * gnu/packages/wm.scm (wld): New variable.

I fixed issues reported by ‘guix lint’ and applied it.

Thanks,
Ludo’.

[bug#58655] [PATCH 2/3] gnu: Add swc.

[zamfofex]

* gnu/packages/wm.scm (swc): New variable.
---
 gnu/packages/wm.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 94dfd28f4a..d5c5dc4ed2 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2966,3 +2966,48 @@ (define-public wld
       (synopsis "A primitive drawing library targeted at Wayland")
       (description "wld is a drawing library that targets Wayland.")
       (license license:expat))))
+
+(define-public swc
+  (let ((commit "a7b615567f83d9e48d585251015048c441ca0239")
+        (revision "1"))
+    (package
+      (name "swc")
+      (version (git-version "0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                       (url "https://github.com/michaelforney/swc")
+                       (commit commit)))
+                (sha256
+                  (base32
+                    "19rpbwpi81pm92fkhsmbx7pzagpah5m9ih5h5k3m8dy6r8ihdh35"))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:tests? #f ; no tests
+         #:make-flags
+         (list (string-append "CC=" ,(cc-for-target))
+               (string-append "PREFIX=" %output))
+         #:phases
+         (modify-phases %standard-phases
+           (delete 'configure))))
+      (inputs (list libdrm
+                    libinput
+                    libxcb
+                    libxkbcommon
+                    wayland
+                    wayland-protocols
+                    wld
+                    xcb-util-wm))
+      (native-inputs (list pkg-config))
+      (home-page "https://github.com/michaelforney/swc")
+      (synopsis "A library for making a simple Wayland compositor")
+      (description "swc is a small Wayland compositor implemented as a library.
+
+It has been designed primarily with tiling window managers in mind.  Additionally,
+notable features include:
+@itemize
+@item Easy to follow code base
+@item XWayland support
+@item Can place borders around windows
+@end itemize")
+      (license license:expat))))
-- 
2.38.0

[bug#58654] [PATCH 0/3] add velox

[Ludovic Courtès]

[-- Attachment #1: Type: text/plain, Size: 226 bytes --]

Hi,

zamfofex <zamfofex@twdb.moe> skribis:

> * gnu/packages/wm.scm (swc): New variable.

Finally applied with the changes below to address ‘guix lint’ warnings.

Thanks and apologies for the delay!

Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1554 bytes --]

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index f873101615..96b3c3a666 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2997,14 +2997,15 @@ (define-public swc
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                       (url "https://github.com/michaelforney/swc")
-                       (commit commit)))
+                      (url "https://github.com/michaelforney/swc")
+                      (commit commit)))
                 (sha256
-                  (base32
-                    "19rpbwpi81pm92fkhsmbx7pzagpah5m9ih5h5k3m8dy6r8ihdh35"))))
+                 (base32
+                  "19rpbwpi81pm92fkhsmbx7pzagpah5m9ih5h5k3m8dy6r8ihdh35"))
+                (file-name (git-file-name name version))))
       (build-system gnu-build-system)
       (arguments
-       `(#:tests? #f ; no tests
+       `(#:tests? #f                              ;no tests
          #:make-flags
          (list (string-append "CC=" ,(cc-for-target))
                (string-append "PREFIX=" %output))
@@ -3021,7 +3022,7 @@ (define-public swc
                     xcb-util-wm))
       (native-inputs (list pkg-config))
       (home-page "https://github.com/michaelforney/swc")
-      (synopsis "A library for making a simple Wayland compositor")
+      (synopsis "Library for making a simple Wayland compositor")
       (description "swc is a small Wayland compositor implemented as a library.
 
 It has been designed primarily with tiling window managers in mind.  Additionally,

[bug#58656] [PATCH 3/3] gnu: Add velox.

[zamfofex]

* gnu/packages/wm.scm (velox): New variable.
---
 gnu/packages/wm.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index d5c5dc4ed2..8a6f3684de 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -3011,3 +3011,37 @@ (define-public swc
 @item Can place borders around windows
 @end itemize")
       (license license:expat))))
+
+(define-public velox
+  (let ((commit "fcc041265539befd907a64ee3a536cb2489ffb99")
+        (revision "1"))
+    (package
+      (name "velox")
+      (version (git-version "0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                       (url "https://github.com/michaelforney/velox")
+                       (commit commit)))
+                (sha256
+                  (base32
+                    "0d11bmag5zwmas3rf1b7x5hjla7wpxq70nr86dz3x9r7cal04mym"))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:tests? #f ; no tests
+         #:make-flags
+         (list (string-append "CC=" ,(cc-for-target))
+               (string-append "PREFIX=" %output))
+         #:phases
+         (modify-phases %standard-phases
+           (delete 'configure))))
+      (inputs (list libinput
+                    libxkbcommon
+                    wayland
+                    wld))
+      (propagated-inputs (list swc))
+      (native-inputs (list pkg-config))
+      (home-page "https://github.com/michaelforney/velox")
+      (synopsis "A simple window manager based on swc")
+      (description "velox is a simple window manager based on swc.  It is inspired by dwm and xmonad.")
+      (license license:expat))))
-- 
2.38.0