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

rosenthal: hyprland: Update to 0.35.0.

Browse Source 
* rosenthal/packages/wm.scm (libdrm-for-hyprland): Update to 2.4.120.
(wlroots-for-hyprland): Update to 0.17.0-168.00b869c.
(hyprland): Update to 0.35.0.
[source]<snippet>: Remove hyprpm.
[arguments]<#:phases>: Adjust substitution.
[inputs]: Add cairo-for-hyprland, gcc-13.
This commit is contained in:
Hilton Chain 2024-02-05 23:53:30 +08:00
parent f0c3bba1ec
commit d29af10233
No known key found for this signature in database
GPG Key ID: ACC66D09CA528292
1 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
rosenthal/packages/wm.scm
View File

@ -12,6 +12,7 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
@ -85,7 +86,7 @@
(package (package
(inherit libdrm) (inherit libdrm)
(name "libdrm") (name "libdrm")
(version "2.4.118") (version "2.4.120")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -93,7 +94,7 @@
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"125bcyarlzlxfq57viyvmxy32y0561c21j46z1brrz5mya2vsxx7")))))) "0yijzgg6rdsa68bz03sw0lcfa2nclv9m3as1cja50wkcyxim7x9v"))))))
(define udis86-for-hyprland (define udis86-for-hyprland
(let ((revision "186") (let ((revision "186")
@ -122,12 +123,12 @@ 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 "903") (revision "168")
(commit "5d639394f3e83b01596dcd166a44a9a1a2583350")) (commit "00b869c1a96f300a8f25da95d624524895e0ddf2"))
(package (package
(inherit base) (inherit base)
(name "wlroots") (name "wlroots")
(version (git-version "0.16.0" revision commit)) (version (git-version "0.17.0" revision commit))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -136,7 +137,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
"0nn6zyz7486fbpxibdz5yg7pmw15qh7r0rjz2baxqykm1yhg4jzf")))) "18s8iw3w8g3qwd6kw03r2myms5hxhl4xryy9vmpj573y98di6xg4"))))
(propagated-inputs (propagated-inputs
(modify-inputs (package-propagated-inputs wlroots) (modify-inputs (package-propagated-inputs wlroots)
(prepend libdisplay-info-for-hyprland libdrm-for-hyprland) (prepend libdisplay-info-for-hyprland libdrm-for-hyprland)
@ -181,18 +182,25 @@ protocols used by Hyprland to bridge the aforementioned gap.")
(define-public hyprland (define-public hyprland
(package (package
(name "hyprland") (name "hyprland")
(version "0.33.1") (version "0.35.0")
(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"
"/releases/download/v" version "/releases/download/v" version
"/source-v" version ".tar.gz")) "/source-v" version ".tar.gz"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet '(delete-file-recursively "subprojects")) (snippet
'(begin
;; Remove bundled sources and hyprpm utility.
(substitute* "meson.build"
((".*hyprpm/src.*") ""))
(for-each delete-file-recursively
'("hyprpm"
"subprojects"))))
(patches (list hyprland-unbundle-wlroots-patch)) (patches (list hyprland-unbundle-wlroots-patch))
(sha256 (sha256
(base32 (base32
"0lwib3a4spdpigzz4333wppljm1if6fa97nnb50y1pd4j353jazy")))) "06wcpcb3hd6av3scv9qnvp6zs6g6sqx8m7r0rjmchcb1c1jdflyy"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
(list #:build-type "release" (list #:build-type "release"
@ -200,18 +208,26 @@ protocols used by Hyprland to bridge the aforementioned gap.")
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'fix-path (add-after 'unpack 'fix-path
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/render/OpenGL.cpp" (substitute* (find-files "src" "\\.cpp$")
(("/usr") #$output)) (("/usr/local(/bin/Hyprland)" _ path)
(substitute* (find-files "src" "\\.cpp") (string-append #$output path))
(("(execAndGet\\(\\(?\")\\<(cat|fc-list|lspci|nm)\\>" (("/usr") #$output)
(("(execAndGet\\(\")\\<(cat|fc-list|lspci)\\>"
_ pre cmd) _ pre cmd)
(format #f "~a~a" (string-append
pre pre (search-input-file
(search-input-file inputs (string-append "bin/" cmd))))
inputs (string-append "/bin/" cmd)))))))))) (("\\<cc\\>") (search-input-file inputs "bin/gcc"))
;; NOTE: Add binutils to inputs will override ld-wrapper.
(("(execAndGet\\(\\(\")\\<nm\\>" _ pre)
(string-append pre #$binutils "/bin/nm"))
(("\\<objcopy\\>")
(string-append #$binutils "/bin/objcopy"))))))))
(native-inputs (list gcc-13 jq pkg-config)) (native-inputs (list gcc-13 jq pkg-config))
(inputs (inputs
(list hyprland-protocols (list cairo-for-hyprland
gcc-13
hyprland-protocols
pango pango
pciutils pciutils
udis86-for-hyprland udis86-for-hyprland