ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 06:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: sway: Update to 1.9.

Browse source 
* gnu/packages/wm.scm (sway): Update to 1.9.
[arguments]<#:phases>: Don't hardcode path to scdoc.
[inputs]: Replace wlroots-0.16 with wlroots.

Change-Id: I2108e57180a91dc2873d5398dc5f6981002e1c3d
This commit is contained in:
Hilton Chain 2024-02-27 23:48:25 +08:00
parent a900fa3c6c
commit 0e9c2d2eba
No known key found for this signature in database
GPG key ID: ACC66D09CA528292
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/wm.scm
View file

@ -1762,7 +1762,7 @@ (define-public wlroots-0.16
(define-public sway (define-public sway
(package (package
(name "sway") (name "sway")
(version "1.8.1") (version "1.9")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1771,7 +1771,7 @@ (define-public sway
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1y7brfrsjnm9gksijgnr6zxqiqvn06mdiwsk5j87ggmxazxd66av")))) (base32 "1n36vgpi4bg2gkiq4fam4khly1z9bjinmjclzq5vfx0z8h7a5bzz"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(;; elogind is propagated by wlroots -> libseat `(;; elogind is propagated by wlroots -> libseat
@ -1786,11 +1786,6 @@ (define-public sway
(("strdup..swaybg..") (("strdup..swaybg..")
(string-append "strdup(\"" (assoc-ref inputs "swaybg") (string-append "strdup(\"" (assoc-ref inputs "swaybg")
"/bin/swaybg\")"))) "/bin/swaybg\")")))
;; Hardcode path to scdoc.
(substitute* "meson.build"
(("scdoc.get_pkgconfig_variable..scdoc..")
(string-append "'" (assoc-ref inputs "scdoc")
"/bin/scdoc'")))
#t))))) #t)))))
(inputs (list basu (inputs (list basu
cairo cairo
@ -1803,7 +1798,7 @@ (define-public sway
pcre2 pcre2
swaybg swaybg
wayland wayland
wlroots-0.16)) wlroots))
(native-inputs (native-inputs
(cons* linux-pam mesa pkg-config scdoc wayland-protocols (cons* linux-pam mesa pkg-config scdoc wayland-protocols
(if (%current-target-system) (if (%current-target-system)