This commit is contained in:
Daniel Ziltener 2024-04-07 13:26:37 +02:00
parent 6327a238a0
commit 10fa9287aa
Signed by: zilti
GPG Key ID: B38976E82C9DAE42

View File

@ -47,6 +47,7 @@
#:use-module (gnu packages qt) #:use-module (gnu packages qt)
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
#:use-module (gnu packages xdisorg) #:use-module (gnu packages xdisorg)
#:use-module (gnu packages vulkan)
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages wm) #:use-module (gnu packages wm)
@ -142,14 +143,14 @@ command line tool called @code{udcli} that incorporates the library.")
(base32 (base32
"1sxgvis0abkymc02nhx2svm60myiq3shvy759sphpxl5rp52g6y5")))))) "1sxgvis0abkymc02nhx2svm60myiq3shvy759sphpxl5rp52g6y5"))))))
(define wlroots-for-hyprland (define-public wlroots-for-hyprland
(let ((base wlroots) (let ((base wlroots)
(revision "255") (revision "255")
(commit "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b")) (commit "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b"))
(package (package
(inherit base) (inherit base)
(name "wlroots") (name "wlroots")
(version (git-version "0.17.0" revision commit)) (version (git-version "0.18.0" revision commit))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -162,6 +163,7 @@ command line tool called @code{udcli} that incorporates the library.")
(propagated-inputs (propagated-inputs
(modify-inputs (package-propagated-inputs wlroots) (modify-inputs (package-propagated-inputs wlroots)
(prepend libdrm-for-hyprland) (prepend libdrm-for-hyprland)
(prepend xcb-util-renderutil)
(replace "libinput-minimal" libinput-minimal-1.24.0) (replace "libinput-minimal" libinput-minimal-1.24.0)
(replace "wayland-protocols" wayland-protocols-for-hyprland))) (replace "wayland-protocols" wayland-protocols-for-hyprland)))
(native-inputs (native-inputs
@ -191,10 +193,11 @@ command line tool called @code{udcli} that incorporates the library.")
(sha256 (sha256
(base32 "00i7c98ignfgkk3x1r1masmlj92xzb8cdb7nyfhivbfkdlfyzgpj")))) (base32 "00i7c98ignfgkk3x1r1masmlj92xzb8cdb7nyfhivbfkdlfyzgpj"))))
#;
(define-public hyprland (define-public hyprland
(package (package
(name "hyprland") (name "hyprland")
(version "0.38.0") (version "0.38.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/hyprwm/Hyprland" (uri (string-append "https://github.com/hyprwm/Hyprland"
@ -204,7 +207,7 @@ command line tool called @code{udcli} that incorporates the library.")
(patches (list hyprland-unbundle-wlroots-patch)) (patches (list hyprland-unbundle-wlroots-patch))
(sha256 (sha256
(base32 (base32
"022z62y5irmgnm6m0wfgkg8iw3gs5f2p8155h49lgzzc46nka0kf")))) "1avkzdcgyk65p44nwl9w8sv4iq5xs13i7i66jsya9z06q1f3d1hs"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:phases (list #:phases
@ -261,11 +264,10 @@ effects, has a very flexible IPC model allowing for a lot of customization, and
more.") more.")
(license license:bsd-3))) (license license:bsd-3)))
#;
(define-public hyprland (define-public hyprland
(package (package
(name "hyprland") (name "hyprland")
(version "0.38.0") (version "0.38.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/hyprwm/Hyprland" (uri (string-append "https://github.com/hyprwm/Hyprland"
@ -275,7 +277,7 @@ more.")
(patches (list hyprland-unbundle-wlroots-patch)) (patches (list hyprland-unbundle-wlroots-patch))
(sha256 (sha256
(base32 (base32
"022z62y5irmgnm6m0wfgkg8iw3gs5f2p8155h49lgzzc46nka0kf")))) "1avkzdcgyk65p44nwl9w8sv4iq5xs13i7i66jsya9z06q1f3d1hs"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
(list #:build-type "release" (list #:build-type "release"
@ -302,7 +304,9 @@ more.")
(lambda _ (lambda _
(copy-recursively (copy-recursively
"protocols" "../hyprland-source/protocols") "protocols" "../hyprland-source/protocols")
(invoke "ls") (invoke "mkdir" "../hyprland-source/build")
(copy-file
"meson-private/hyprland.pc" "../hyprland-source/build/hyprland.pc")
(invoke "find" "." "-name" "hyprland.pc") (invoke "find" "." "-name" "hyprland.pc")
(with-directory-excursion (with-directory-excursion
"../hyprland-source" "../hyprland-source"