seasharp/Rosenthal
1
0
Fork 0
mirror of https://codeberg.org/hako/Rosenthal.git synced 2025-06-14 14:55:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

rosenthal: hyprland: Update to 0.29.0.

Browse Source 
* rosenthal/packages/wm.scm (wlroots-for-hyprland): Update to
0.16.0-724.717ded9.
(hyprland-portals-patch): Delete variable.
(hyprland): Update to 0.29.0.
[source]: Switch to tarball.
This commit is contained in:
Hilton Chain 2023-08-29 15:36:48 +08:00
parent bd96a46416
commit ebb9a4e88e
No known key found for this signature in database
GPG Key ID: ACC66D09CA528292
1 changed files with 53 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
rosenthal/packages/wm.scm
View File

@ -91,8 +91,8 @@ command line tool called @code{udcli} that incorporates the library.")
(define wlroots-for-hyprland (define wlroots-for-hyprland
(let ((base wlroots) (let ((base wlroots)
(revision "669") (revision "724")
(commit "e8d545a9770a2473db32e0a0bfa757b05d2af4f3")) (commit "717ded9bb0191ea31bf4368be32e7a15fe1b8294"))
(package (package
(inherit base) (inherit base)
(name "wlroots") (name "wlroots")
@ -105,7 +105,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
"1pz8i3g24flswvv762jxnhff67jgl2nvqrj03f84fi1srf769zl2")))) "0k4xhdpcv6c38vb2m3khjbikcmj48z3ry1696rv0zijcpcds84kq"))))
(propagated-inputs (propagated-inputs
(modify-inputs (package-propagated-inputs base) (modify-inputs (package-propagated-inputs base)
(append libdisplay-info-for-hyprland libxcb xcb-util-renderutil) (append libdisplay-info-for-hyprland libxcb xcb-util-renderutil)
@ -149,73 +149,57 @@ protocols used by Hyprland to bridge the aforementioned gap.")
(sha256 (sha256
(base32 "1wj0kwvkkk2r7k18m9i2hdp9i9z7n330dib27jlbc8mjr96976y5")))) (base32 "1wj0kwvkkk2r7k18m9i2hdp9i9z7n330dib27jlbc8mjr96976y5"))))
(define hyprland-portals-patch
(origin
(method url-fetch)
(uri (string-append "https://github.com/hyprwm/Hyprland" "/raw/"
"64fc19cc811434b81ab9bc6b8c64edbcbfd0cfd4" "/nix/"
"portals.patch"))
(sha256
(base32 "14nijw02lb0c4h06adki0w7amgxg1m0qj48ds7iq4bq6fkl1m5l0"))))
(define-public hyprland (define-public hyprland
(let ((commit "9654749244117f7f150c6f2a2ce4dede6e8cbb25")) (package
(package (name "hyprland")
(name "hyprland") (version "0.29.0")
;; NOTE: Remember to update commit hash ^ (source (origin
(version "0.28.0") (method url-fetch)
(source (origin (uri (string-append "https://github.com/hyprwm/Hyprland"
(method git-fetch) "/releases/download/v" version
(uri (git-reference "/source-v" version ".tar.gz"))
(url "https://github.com/hyprwm/Hyprland") (modules '((guix build utils)))
(commit (string-append "v" version)))) (snippet '(delete-file-recursively "subprojects"))
(file-name (git-file-name name version)) (patches (list hyprland-unbundle-wlroots-patch))
(patches (list hyprland-unbundle-wlroots-patch (sha256
hyprland-portals-patch)) (base32
(sha256 "0w4lx8ixdv4pi67kavs3r3d4zykmhn4pigch6dwqidgxsf382j9a"))))
(base32 (build-system meson-build-system)
"1ipg3f1js291vyh9888qsy5hgqqj10m8zzc1y8i1ihgikyzsqlmp")))) (arguments
(build-system meson-build-system) (list #:build-type "release"
(arguments #:phases
(list #:build-type "release" #~(modify-phases %standard-phases
#:phases (add-after 'unpack 'fix-path
#~(modify-phases %standard-phases (lambda* (#:key inputs #:allow-other-keys)
(add-after 'unpack 'fix-path (substitute* "src/render/OpenGL.cpp"
(lambda* (#:key inputs #:allow-other-keys) (("/usr") #$output))
(substitute* "src/render/OpenGL.cpp" (substitute* (find-files "src" "\\.cpp")
(("/usr") #$output)) (("(execAndGet\\(\\(?\")\\<(cat|fc-list|lspci|nm)\\>"
(substitute* (find-files "src" "\\.cpp") _ pre cmd)
(("(execAndGet\\(\\(?\")\\<(cat|fc-list|lspci|nm)\\>" (format #f "~a~a"
_ pre cmd) pre
(format #f "~a~a" (search-input-file
pre inputs (string-append "/bin/" cmd)))))))
(search-input-file (add-after 'unpack 'substitute-meson-build
inputs (string-append "/bin/" cmd))))))) (lambda _
(add-after 'unpack 'substitute-meson-build (substitute* "meson.build"
(lambda _ (("\\<git\\>") "true")
(substitute* "meson.build" ((".*@.*") "")))))))
(("git") "true") (native-inputs (list gcc-12 jq pkg-config))
(("@GIT_BRANCH@") "main") (inputs
(("@GIT_COMMIT_HASH@") #$commit) (list hyprland-protocols
(("@GIT_COMMIT_MESSAGE@") "?") pango
(("@GIT_DIRTY@") "")) pciutils
(substitute* (find-files "src" "\\.cpp") udis86-for-hyprland
(("GIT_TAG") (format #f "\"v~a\"" #$version)))))))) wlroots-for-hyprland))
(native-inputs (list gcc-12 jq pkg-config)) (home-page "https://hyprland.org")
(inputs (synopsis "Dynamic tiling Wayland compositor based on wlroots")
(list hyprland-protocols (description
pango "Hyprland is a dynamic tiling Wayland compositor based on @code{wlroots}
pciutils that doesn't sacrifice on its looks. It supports multiple layouts, fancy
udis86-for-hyprland effects, has a very flexible IPC model allowing for a lot of customization, and
wlroots-for-hyprland)) more.")
(home-page "https://hyprland.org") (license license:bsd-3)))
(synopsis "Dynamic tiling Wayland compositor based on wlroots")
(description
"@code{Hyprland} is a dynamic tiling Wayland compositor based on
@code{wlroots} that doesn't sacrifice on its looks. It supports multiple
layouts, fancy effects, has a very flexible IPC model allowing for a lot of
customization, and more.")
(license license:bsd-3))))
(define-public grimblast (define-public grimblast
(package (package