me
/
guix
Archived
1
0
Fork 0
Code

gnu: wlroots: Update to 0.16.1. 

* gnu/packages/wm.scm (wlroots): Update to 0.16.1.
[arguments]: Add 'fix-meson-file phase to fix pnp.ids path.
[native-inputs]: Add hwdata:pnp.

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
master
Gabriel Wicki 2023-04-06 10:39:39 +02:00 committed by Jonathan Brielmaier
parent f1d4d22fc2
commit d646c2937b
No known key found for this signature in database
GPG Key ID: ECFC83988B4E4B9F
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gnu/packages/wm.scm
View File

@ -60,6 +60,8 @@
;;; Copyright © 2022 Fredrik Salomonsson <plattfot@posteo.net> ;;; Copyright © 2022 Fredrik Salomonsson <plattfot@posteo.net>
;;; Copyright © 2022 ( <paren@disroot.org> ;;; Copyright © 2022 ( <paren@disroot.org>
;;; Copyright © 2022 zamfofex <zamfofex@twdb.moe> ;;; Copyright © 2022 zamfofex <zamfofex@twdb.moe>
;;; Copyright © 2023 Gabriel Wicki <gabriel@erlikon.ch>
;;; Copyright © 2023 Jonathan Brielamier <jonathan.brielmaier@web.de>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -131,6 +133,7 @@
#:use-module (gnu packages man) #:use-module (gnu packages man)
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
#:use-module (gnu packages mpd) #:use-module (gnu packages mpd)
#:use-module (gnu packages pciutils)
#:use-module (gnu packages pcre) #:use-module (gnu packages pcre)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
@ -1539,7 +1542,7 @@ functionality to display information about the most commonly used services.")
(define-public wlroots (define-public wlroots
(package (package
(name "wlroots") (name "wlroots")
(version "0.15.1") (version "0.16.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1548,7 +1551,7 @@ functionality to display information about the most commonly used services.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "00s73nhi3sc48l426jdlqwpclg41kx1hv0yk4yxhbzw19gqpfm1h")))) (base32 "11kcica9waj1a1xgbi12gif9z5z0b4xzycbcgawbgdmj77pws8sk"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -1559,7 +1562,13 @@ functionality to display information about the most commonly used services.")
(("Xwayland") (string-append (assoc-ref inputs (("Xwayland") (string-append (assoc-ref inputs
"xorg-server-xwayland") "xorg-server-xwayland")
"/bin/Xwayland"))) "/bin/Xwayland")))
#t))))) #t))
(add-before 'configure 'fix-meson-file
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "backend/drm/meson.build"
(("/usr/share/hwdata/pnp.ids")
(string-append (assoc-ref inputs "hwdata")
"/share/hwdata/pnp.ids"))))))))
(propagated-inputs (propagated-inputs
(list ;; As required by wlroots.pc. (list ;; As required by wlroots.pc.
eudev eudev
@ -1574,7 +1583,9 @@ functionality to display information about the most commonly used services.")
xcb-util-wm xcb-util-wm
xorg-server-xwayland)) xorg-server-xwayland))
(native-inputs (native-inputs
(list pkg-config)) (list
`(,hwdata "pnp")
pkg-config))
(home-page "https://github.com/swaywm/wlroots") (home-page "https://github.com/swaywm/wlroots")
(synopsis "Pluggable, composable, unopinionated modules for building a (synopsis "Pluggable, composable, unopinionated modules for building a
Wayland compositor") Wayland compositor")