me/guix
Archived
1
0
Fork 0
Code Activity

gnu: wlroots: Update to 0.12.0.

Browse source 
* gnu/packages/wm.scm (wlroots): Update to 0.12.0.
[arguments]: Add #:meson.  Adjust Xwayland substitution in #:phases.
[inputs]: Move everything ...
[propagated-inputs]: ... here.  Add XCB-UTIL-ERRORS and XCB-UTIL-WM.
[native-inputs]: Remove FFMPEG, LIBCAP, and LIBPNG.
This commit is contained in:
Marius Bakke 2020-11-19 23:52:45 +01:00
parent 35ed83beae
commit f5fb52f147
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
gnu/packages/wm.scm
View file

@ -13,7 +13,7 @@
;;; Copyright © 2016 doncatnip <gnopap@gmail.com> ;;; Copyright © 2016 doncatnip <gnopap@gmail.com>
;;; Copyright © 2016 Ivan Vilata i Balaguer <ivan@selidor.net> ;;; Copyright © 2016 Ivan Vilata i Balaguer <ivan@selidor.net>
;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com> ;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com>
;;; Copyright © 2017, 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2019, 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2017, 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2017, 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr> ;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr>
@ -72,6 +72,7 @@
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages build-tools) ;for meson-0.55
#:use-module (gnu packages calendar) #:use-module (gnu packages calendar)
#:use-module (gnu packages docbook) #:use-module (gnu packages docbook)
#:use-module (gnu packages documentation) #:use-module (gnu packages documentation)
@ -1342,7 +1343,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.10.1") (version "0.12.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1351,32 +1352,35 @@ 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 "0j2lh9vc92zhn44rjbia5aw3y1rpgfng1x1h17lcvj5m4i6vj0pc")))) (base32 "01j38lmgs2c6fq68v8b75pkilia2wsgzgp46ivfbi9hhx47kgcfn"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:configure-flags '("-Dlogind-provider=elogind") `(#:configure-flags '("-Dlogind-provider=elogind")
#:meson ,meson-0.55
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'hardcode-paths (add-before 'configure 'hardcode-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "xwayland/xwayland.c" (substitute* "xwayland/server.c"
(("Xwayland") (string-append (assoc-ref inputs (("Xwayland") (string-append (assoc-ref inputs
"xorg-server-xwayland") "xorg-server-xwayland")
"/bin/Xwayland"))) "/bin/Xwayland")))
#t))))) #t)))))
(inputs `(("elogind" ,elogind) (propagated-inputs
("eudev" ,eudev) `(;; As required by wlroots.pc.
("libinput" ,libinput) ("elogind" ,elogind)
("libxkbcommon" ,libxkbcommon) ("eudev" ,eudev)
("mesa" ,mesa) ("libinput" ,libinput)
("pixman" ,pixman) ("libxkbcommon" ,libxkbcommon)
("wayland" ,wayland) ("mesa" ,mesa)
("xorg-server-xwayland" ,xorg-server-xwayland))) ("pixman" ,pixman)
(native-inputs `(("ffmpeg" ,ffmpeg) ("wayland" ,wayland)
("libcap" ,libcap) ("xcb-util-errors" ,xcb-util-errors)
("libpng" ,libpng) ("xcb-util-wm" ,xcb-util-wm)
("pkg-config" ,pkg-config) ("xorg-server-xwayland" ,xorg-server-xwayland)))
("wayland-protocols" ,wayland-protocols))) (native-inputs
`(("pkg-config" ,pkg-config)
("wayland-protocols" ,wayland-protocols)))
(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")