diff options
Diffstat (limited to 'gnu/packages/xdisorg.scm')
| -rw-r--r-- | gnu/packages/xdisorg.scm | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 22f29c93be..11e815bd72 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -32,7 +32,7 @@ ;;; Copyright © 2020, 2021 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2020 David Wilson <david@daviwil.com> ;;; Copyright © 2020 Ivan Vilata i Balaguer <ivan@selidor.net> -;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> +;;; Copyright © 2020, 2021 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020 Damien Cassou <damien@cassou.me> ;;; Copyright © 2020 John Soo <jsoo1@asu.edu> ;;; Copyright © 2020 Boris A. Dekshteyn <boris.dekshteyn@gmail.com> @@ -43,6 +43,7 @@ ;;; Copyright © 2020 James Smith <jsubuntuxp@disroot.org> ;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com> ;;; Copyright © 2020, 2021 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> ;;; Copyright © 2021 Renzo Poddighe <renzo@poddighe.nl> @@ -420,14 +421,14 @@ avoiding password prompts when X11 forwarding has already been setup.") (define-public libxkbcommon (package (name "libxkbcommon") - (version "1.0.3") + (version "1.3.0") (source (origin (method url-fetch) (uri (string-append "https://xkbcommon.org/download/libxkbcommon-" version ".tar.xz")) (sha256 (base32 - "0lmwglj16anhpaq0h830xsl1ivknv75i4lir9bk88aq73s2jy852")))) + "0ysynzzgzd9jdrh1321r4bgw8wd5zljrlyn5y1a31g39xacf02bv")))) (build-system meson-build-system) (inputs `(("libx11" ,libx11) @@ -603,7 +604,7 @@ following the mouse.") (define-public pixman (package (name "pixman") - (version "0.38.4") + (version "0.40.0") (source (origin (method url-fetch) @@ -612,13 +613,17 @@ following the mouse.") "https://www.cairographics.org/releases/pixman-" version ".tar.gz")) (sha256 - (base32 "1ryxzdf048x7wsx4dlvrr1p00gzwfs7lybnhgc7ygbj0dvyxcrns")) + (base32 "1z13n96m7x91j25qq9wlkxsbq04wfwjhw66ir17frna06zn0s83d")) (patches (search-patches "pixman-CVE-2016-5296.patch")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("--disable-static"))) + `(#:configure-flags + (list + "--disable-static" + "--enable-timers" + "--enable-gnuplot"))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs @@ -629,12 +634,12 @@ following the mouse.") manipulation, providing features such as image compositing and trapezoid rasterisation.") (home-page "http://www.pixman.org/") - (license license:x11))) + (license license:expat))) (define-public libdrm (package (name "libdrm") - (version "2.4.103") + (version "2.4.104") (source (origin (method url-fetch) (uri (string-append @@ -642,7 +647,7 @@ rasterisation.") version ".tar.xz")) (sha256 (base32 - "08h2nnf4w96b4ql7485mvjgbbsb8rwc0qa93fdm1cq34pbyszq1z")))) + "1jqvx9c23hgwhq109zqj6vg3ng40pcvh3r1k2fn1a424qasxhsnn")))) (build-system meson-build-system) (arguments `(#:configure-flags @@ -1383,15 +1388,12 @@ the X.Org X Server version 1.7 and later (X11R7.5 or later).") (add-after 'split-outputs 'wrap (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((gtk (assoc-ref outputs "gtk")) - (python-version - (@ (guix build python-build-system) python-version)) - (python (assoc-ref inputs "python")) - (sitedir (string-append gtk "/lib/python" - (python-version python) - "/site-packages"))) + (site-packages (@ (guix build python-build-system) + site-packages)) + (site (site-packages inputs outputs))) (wrap-program (string-append gtk "/bin/redshift-gtk") - `("PYTHONPATH" ":" prefix - (,(string-append sitedir ":" (getenv "PYTHONPATH")))) + `("GUIX_PYTHONPATH" ":" prefix + (,(string-append site ":" (getenv "GUIX_PYTHONPATH")))) `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")))) #t)))))) (outputs '("out" "gtk")) @@ -2620,10 +2622,12 @@ tools to complement clipnotify.") (gawk (assoc-ref inputs "gawk")) (util-linux (assoc-ref inputs "util-linux")) (xdotool (assoc-ref inputs "xdotool")) - (xsel (assoc-ref inputs "xsel"))) + (xsel (assoc-ref inputs "xsel")) + (guile (search-input-file inputs "bin/guile"))) (for-each (lambda (prog) (wrap-script (string-append out "/bin/" prog) + #:guile guile `("PATH" ":" prefix ,(map (lambda (dir) (string-append dir "/bin")) |