diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-05-01 23:11:41 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-05-01 23:11:41 +0200 |
| commit | 3b458d5462e6bbd852c2dc5c6670d5655abf53f5 (patch) | |
| tree | 4f3ccec0de1c355134369333c17e948e3258d546 /gnu/packages/xdisorg.scm | |
| parent | 2ca3fdc2db1aef96fbf702a2f26f5e18ce832038 (diff) | |
| parent | 14da3daafc8dd92fdabd3367694c930440fd72cb (diff) | |
| download | guix-3b458d5462e6bbd852c2dc5c6670d5655abf53f5.tar guix-3b458d5462e6bbd852c2dc5c6670d5655abf53f5.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/xdisorg.scm')
| -rw-r--r-- | gnu/packages/xdisorg.scm | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index c0333fbc82..03b27f35a5 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2015, 2016 Alex Kost <alezost@gmail.com> -;;; Copyright © 2013, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2015, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2015 Alexander I.Grafov <grafov@gmail.com> ;;; Copyright © 2015 Andy Wingo <wingo@igalia.com> @@ -402,13 +402,11 @@ rasterisation.") "-Dtegra=true" "-Dfreedreno-kgsl=true")) (_ '()))) - ,@(if (string=? (%current-system) "armhf-linux") - '(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "meson" "test" "--timeout-multiplier" "5"))))) - '()))) + + #:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "meson" "test" "--timeout-multiplier" "5")))))) (inputs `(("libpciaccess" ,libpciaccess))) (native-inputs @@ -576,7 +574,7 @@ selection's dimensions to stdout.") (define-public maim (package (name "maim") - (version "5.5.2") + (version "5.5.3") (source (origin (method git-fetch) (uri (git-reference @@ -585,7 +583,7 @@ selection's dimensions to stdout.") (file-name (git-file-name name version)) (sha256 (base32 - "14mfxdm39kc5jk8wysrzx05ag2g4sk9l24i8m5pzqn8j611150v3")))) + "1kbxsz8whfxl5blwsvpva2q95zwy72argwhi1cfqh5lrhzq5zrpp")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no "check" target @@ -959,7 +957,7 @@ Escape key when Left Control is pressed and released on its own.") (define-public libwacom (package (name "libwacom") - (version "0.32") + (version "0.33") (source (origin (method url-fetch) (uri (string-append @@ -967,7 +965,7 @@ Escape key when Left Control is pressed and released on its own.") "libwacom-" version "/libwacom-" version ".tar.bz2")) (sha256 (base32 - "102kz0q7i0bjsnl6yy83vcj2rpir12rs2d4xr0wvhw84rs5sp7bb")))) + "1wnv34y7m9l6avlvwqvfrnksfnsz1lbgb412dn6s7x1h3wvs7y4l")))) (build-system glib-or-gtk-build-system) (native-inputs `(("pkg-config" ,pkg-config))) |