1 files changed, 25 insertions(+), 4 deletions(-)

M ruther/packages/dwl.scm

@@ 1,16 1,19 @@
 (define-module (ruther packages dwl)
   #:use-module (guix packages)
+  #:use-module (gnu packages)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages wm)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages ghostscript)
 
   #:use-module (guix download)
   #:use-module (guix git-download))
 
 (define-public libdrm-2.4.122
   (package/inherit libdrm
+    (name "libdrm-next")
     (version "2.4.122")
     (source
      (origin


@@ 68,12 71,15 @@
                 (commit version)))
           (file-name (git-file-name name version))
           (sha256
-            (base32 "13avi2805wrfkghgc7ar273p61svmm85k3g3hg9bf2gaxsz6f91f"))))
+           (base32 "13avi2805wrfkghgc7ar273p61svmm85k3g3hg9bf2gaxsz6f91f"))
+          (patches (search-patches "wlroots-hwdata-fallback.patch"))))
     (native-inputs (modify-inputs (package-native-inputs wlroots)
                      (replace "wayland" wayland-1.23)))
     (propagated-inputs (modify-inputs (package-propagated-inputs wlroots)
                          (replace "mesa" mesa-libdrm-2.4.122)
-                         (replace "wayland-protocols" wayland-protocols-1.35)))))
+                         (replace "wayland" wayland-1.23)
+                         (replace "wayland-protocols" wayland-protocols-1.35)
+                         (append lcms)))))
 
 (define-public dwl-0.7
   (package/inherit dwl


@@ 84,12 90,27 @@
        (method git-fetch)
        (uri (git-reference
              (url "https://codeberg.org/dwl/dwl.git")
-             (commit "v0.7-rc1")))
+             (commit (string-append "v" version))))
        (sha256
-        (base32 "0sm5rzaf8gmjhrs8bi8wm1whsi9r3b6xypmhv88s64hqgcbs1ymf"))))
+        (base32 "0404awsx8v9fyk7p2bg3p937sc56ixf8ay465xgvjcnv78hh4apd"))))
     (native-inputs
      (modify-inputs (package-native-inputs dwl)
        (append wayland-1.23)))
     (inputs
      (list
       wlroots-0.18))))
+
+(define-public dwl-0.6
+  (package/inherit dwl
+    (version "0.6")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://codeberg.org/dwl/dwl.git")
+             (commit (string-append "v" version))))
+       (sha256
+        (base32 "1j7lmp6k80g54hrsmwixh8ahpnbax4khgiybg8lhlvmq93618a3z"))))
+    (inputs
+     (list
+      wlroots))))