1 files changed, 7 insertions(+), 48 deletions(-)

M ruther/packages/wayland.scm

@@ 46,23 46,6 @@
     (home-page "https://github.com/nyyManni/dmenu-wayland")
     (license #f)))
 
-(define-public libdrm-2.4.122
-  (package/inherit libdrm
-    (name "libdrm-next")
-    (version "2.4.122")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://dri.freedesktop.org/libdrm/libdrm-"
-             version
-             ".tar.xz"))
-       (sha256
-        (base32 "0lgjj9ign3cl27hzmqnxr7xwv21mm486pifc029wmzvxfydhgxfr"))))))
-
-(define-public mesa-libdrm-2.4.122
-  ((package-input-rewriting `((,libdrm . ,libdrm-2.4.122))) mesa))
-
 (define-public wayland-1.23
   (package
     (inherit wayland)


@@ 94,28 77,6 @@
     (inputs (modify-inputs (package-inputs wayland-protocols)
                      (replace "wayland" wayland-1.23)))))
 
-(define-public wlroots-0.18
-  (package/inherit wlroots
-    (name "wlroots")
-    (version "0.18.0")
-    (source
-        (origin
-          (method git-fetch)
-          (uri (git-reference
-                (url "https://gitlab.freedesktop.org/wlroots/wlroots")
-                (commit version)))
-          (file-name (git-file-name name version))
-          (sha256
-           (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" wayland-1.23)
-                         (replace "wayland-protocols" wayland-protocols-1.35)
-                         (append lcms)))))
-
 (define meson-1.5
   (package/inherit meson
     (name "meson-next")


@@ 131,21 92,19 @@
     (build-system python:python-build-system)))
 
 (define-public wlroots-0.19-dev
-  (package/inherit wlroots-0.18
+  (package/inherit wlroots
     (name "wlroots-dev")
     (version "0.19.0-dev")
     (source
         (origin
+          (inherit (package-source wlroots))
           (method git-fetch)
           (uri (git-reference
                 (url "https://gitlab.freedesktop.org/wlroots/wlroots")
                 (commit "2c64f36e8886d1f26daeb2a4ee79f3f9dd3d4c85")))
           (file-name (git-file-name name version))
           (sha256
-           (base32 "0671bgkl66gdw4bsbdi8ddcb5qzm98ykxillza0k2j9nvzfywlbs"))
-          (patches (cons
-                    (local-file "./patches/revert-reset-pressed-buttons-on-focus-change.patch")
-                    (search-patches "wlroots-hwdata-fallback.patch")))))
+           (base32 "0671bgkl66gdw4bsbdi8ddcb5qzm98ykxillza0k2j9nvzfywlbs"))))
     (arguments
      (substitute-keyword-arguments (package-arguments wlroots-0.18)
        ((#:meson meson #f) meson-1.5)))))


@@ 173,10 132,10 @@
              (commit (string-append "v" version))))
        (sha256
         (base32 "0404awsx8v9fyk7p2bg3p937sc56ixf8ay465xgvjcnv78hh4apd"))))
-    (native-inputs
-     (modify-inputs (package-native-inputs dwl)
-       (append wayland-1.23)))
-    (inputs (list wlroots-0.18))))
+    ;; (native-inputs
+    ;;  (modify-inputs (package-native-inputs dwl)
+    ;;    (append wayland-1.23)))
+    (inputs (list wlroots))))
 
 (define-public dwl-0.6
   (package/inherit dwl