|
|
@ -35,7 +35,6 @@ |
|
|
|
#:use-module (gnu packages web) |
|
|
|
#:use-module (gnu packages web) |
|
|
|
#:use-module (gnu packages wm) |
|
|
|
#:use-module (gnu packages wm) |
|
|
|
#:use-module (gnu packages xdisorg) |
|
|
|
#:use-module (gnu packages xdisorg) |
|
|
|
#:use-module (gnu packages xml) |
|
|
|
|
|
|
|
#:use-module (rosenthal packages freedesktop)) |
|
|
|
#:use-module (rosenthal packages freedesktop)) |
|
|
|
|
|
|
|
|
|
|
|
(define cairo-for-hyprland |
|
|
|
(define cairo-for-hyprland |
|
|
@ -109,7 +108,7 @@ command line tool called @code{udcli} that incorporates the library.") |
|
|
|
(package |
|
|
|
(package |
|
|
|
(inherit wayland-protocols) |
|
|
|
(inherit wayland-protocols) |
|
|
|
(name "wayland-protocols") |
|
|
|
(name "wayland-protocols") |
|
|
|
(version "1.36") |
|
|
|
(version "1.34") |
|
|
|
(source (origin |
|
|
|
(source (origin |
|
|
|
(method url-fetch) |
|
|
|
(method url-fetch) |
|
|
|
(uri (string-append |
|
|
|
(uri (string-append |
|
|
@ -118,12 +117,12 @@ command line tool called @code{udcli} that incorporates the library.") |
|
|
|
"wayland-protocols-" version ".tar.xz")) |
|
|
|
"wayland-protocols-" version ".tar.xz")) |
|
|
|
(sha256 |
|
|
|
(sha256 |
|
|
|
(base32 |
|
|
|
(base32 |
|
|
|
"14kyxywpfkgpjpkrybs28q1s2prnz30k1b4zap5a3ybrbvh4vzbi")))))) |
|
|
|
"1sxgvis0abkymc02nhx2svm60myiq3shvy759sphpxl5rp52g6y5")))))) |
|
|
|
|
|
|
|
|
|
|
|
(define wlroots-for-hyprland |
|
|
|
(define wlroots-for-hyprland |
|
|
|
(let ((base wlroots) |
|
|
|
(let ((base wlroots) |
|
|
|
(revision "1") |
|
|
|
(revision "0") |
|
|
|
(commit "5c1d51c5a2793480f5b6c4341ad0797052aec2ea")) |
|
|
|
(commit "611a4f24cd2384378f6e500253983107c6656c64")) |
|
|
|
(package |
|
|
|
(package |
|
|
|
(inherit base) |
|
|
|
(inherit base) |
|
|
|
(name "wlroots") |
|
|
|
(name "wlroots") |
|
|
@ -136,16 +135,7 @@ command line tool called @code{udcli} that incorporates the library.") |
|
|
|
(file-name (git-file-name name version)) |
|
|
|
(file-name (git-file-name name version)) |
|
|
|
(sha256 |
|
|
|
(sha256 |
|
|
|
(base32 |
|
|
|
(base32 |
|
|
|
"0gy0g0kxb3q1wjqrypnvmrxcb4ld3advikchygpwpfp4s9v0mmvd")))) |
|
|
|
"0wpqa241656rcnpszkq14ikz4dxsal2xrrc7ryn22xmciw4rkxxw")))) |
|
|
|
(arguments |
|
|
|
|
|
|
|
(substitute-keyword-arguments (package-arguments wlroots) |
|
|
|
|
|
|
|
((#:phases phases #~%standard-phases) |
|
|
|
|
|
|
|
#~(modify-phases #$phases |
|
|
|
|
|
|
|
(add-after 'unpack 'adjust-patching-script |
|
|
|
|
|
|
|
(lambda _ |
|
|
|
|
|
|
|
(substitute* "patches/apply.sh" |
|
|
|
|
|
|
|
(("apply \\|\\| check_applied \\|\\| fail") |
|
|
|
|
|
|
|
"patch -Np1 < $PATCH")))))))) |
|
|
|
|
|
|
|
(propagated-inputs |
|
|
|
(propagated-inputs |
|
|
|
(modify-inputs (package-propagated-inputs wlroots) |
|
|
|
(modify-inputs (package-propagated-inputs wlroots) |
|
|
|
(prepend libdrm-for-hyprland) |
|
|
|
(prepend libdrm-for-hyprland) |
|
|
@ -206,15 +196,15 @@ protocols used by Hyprland to bridge the aforementioned gap.") |
|
|
|
(origin |
|
|
|
(origin |
|
|
|
(method url-fetch) |
|
|
|
(method url-fetch) |
|
|
|
(uri (string-append "https://github.com/hyprwm/Hyprland" "/raw/" |
|
|
|
(uri (string-append "https://github.com/hyprwm/Hyprland" "/raw/" |
|
|
|
"cba1ade848feac44b2eda677503900639581c3f4" |
|
|
|
"1ebc32f5f4b04c913fb6301b886e016afec4c20e" |
|
|
|
"/nix/patches/meson-build.patch")) |
|
|
|
"/nix/patches/meson-build.patch")) |
|
|
|
(sha256 |
|
|
|
(sha256 |
|
|
|
(base32 "0fwvsshz3k6061p3hdl175pydmj80vnw5rm4xfcn64w1ssfq7liw")))) |
|
|
|
(base32 "0v45zvh8py2awmhmi7ymr8xj0kc9ch9y4i62y4xmq2g7cmq9j6h9")))) |
|
|
|
|
|
|
|
|
|
|
|
(define-public hyprland |
|
|
|
(define-public hyprland |
|
|
|
(package |
|
|
|
(package |
|
|
|
(name "hyprland") |
|
|
|
(name "hyprland") |
|
|
|
(version "0.40.0") |
|
|
|
(version "0.39.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" |
|
|
@ -232,7 +222,7 @@ protocols used by Hyprland to bridge the aforementioned gap.") |
|
|
|
(patches (list hyprland-unbundle-wlroots-patch)) |
|
|
|
(patches (list hyprland-unbundle-wlroots-patch)) |
|
|
|
(sha256 |
|
|
|
(sha256 |
|
|
|
(base32 |
|
|
|
(base32 |
|
|
|
"0f4hs8qzmfmg4lr491b2inanb02xn4xa0gwb8a0ks3m64iwzx589")))) |
|
|
|
"11z7zmy4084ax0g0c2h21ji9znd2drgf0xkdllsmcdnvv27wbla8")))) |
|
|
|
(build-system meson-build-system) |
|
|
|
(build-system meson-build-system) |
|
|
|
(arguments |
|
|
|
(arguments |
|
|
|
(list #:build-type "release" |
|
|
|
(list #:build-type "release" |
|
|
@ -255,7 +245,7 @@ protocols used by Hyprland to bridge the aforementioned gap.") |
|
|
|
(string-append pre #$binutils "/bin/nm")) |
|
|
|
(string-append pre #$binutils "/bin/nm")) |
|
|
|
(("\\<(addr2line|objcopy)\\>" _ cmd) |
|
|
|
(("\\<(addr2line|objcopy)\\>" _ cmd) |
|
|
|
(string-append #$binutils "/bin/" cmd)))))))) |
|
|
|
(string-append #$binutils "/bin/" cmd)))))))) |
|
|
|
(native-inputs (list gcc-13 hyprwayland-scanner jq pkg-config)) |
|
|
|
(native-inputs (list gcc-13 jq pkg-config)) |
|
|
|
(inputs |
|
|
|
(inputs |
|
|
|
(list cairo-for-hyprland |
|
|
|
(list cairo-for-hyprland |
|
|
|
gcc-13 |
|
|
|
gcc-13 |
|
|
@ -297,30 +287,6 @@ more.") |
|
|
|
language used in @code{hyprland}.") |
|
|
|
language used in @code{hyprland}.") |
|
|
|
(license license:gpl3+))) |
|
|
|
(license license:gpl3+))) |
|
|
|
|
|
|
|
|
|
|
|
(define-public hyprwayland-scanner |
|
|
|
|
|
|
|
(package |
|
|
|
|
|
|
|
(name "hyprwayland-scanner") |
|
|
|
|
|
|
|
(version "0.3.4") |
|
|
|
|
|
|
|
(source (origin |
|
|
|
|
|
|
|
(method git-fetch) |
|
|
|
|
|
|
|
(uri (git-reference |
|
|
|
|
|
|
|
(url "https://github.com/hyprwm/hyprwayland-scanner") |
|
|
|
|
|
|
|
(commit (string-append "v" version)))) |
|
|
|
|
|
|
|
(file-name (git-file-name name version)) |
|
|
|
|
|
|
|
(sha256 |
|
|
|
|
|
|
|
(base32 |
|
|
|
|
|
|
|
"0mi0kawfw311ybiy4xipy1n20nvjphkfqzgnd8jxxbkhjkwn0jhg")))) |
|
|
|
|
|
|
|
(build-system cmake-build-system) |
|
|
|
|
|
|
|
(arguments (list #:tests? #f)) ;No tests. |
|
|
|
|
|
|
|
(inputs (list pugixml)) |
|
|
|
|
|
|
|
(native-inputs (list gcc-13 pkg-config)) |
|
|
|
|
|
|
|
(home-page "https://github.com/hyprwm/hyprwayland-scanner") |
|
|
|
|
|
|
|
(synopsis "Hyprland implementation of wayland-scanner, in and for C++") |
|
|
|
|
|
|
|
(description |
|
|
|
|
|
|
|
"This package provides a Hyprland implementation of wayland-scanner, in and |
|
|
|
|
|
|
|
for C++.") |
|
|
|
|
|
|
|
(license license:bsd-3))) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(define-public grimblast |
|
|
|
(define-public grimblast |
|
|
|
(package |
|
|
|
(package |
|
|
|
(name "grimblast") |
|
|
|
(name "grimblast") |
|
|
|