summary refs log tree commit diff
path: root/gnu/packages
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-04-08 23:03:39 +0200
committerLudovic Courtès <ludo@gnu.org>2019-04-08 23:09:18 +0200
commit7dc96170a3684ed75ba232892b2d4390f963a6b3 (patch)
tree537b27779961621f6ddcdfd75a47b00e5e2dc46e /gnu/packages
parentdb7441e4705ee22d9f8abbb764201144ced878cb (diff)
downloadguix-7dc96170a3684ed75ba232892b2d4390f963a6b3.tar.gz
gnu: libdrm: Avoid timeout while running tests.
Suggested by Efraim Flashner at
<https://lists.gnu.org/archive/html/guix-devel/2019-04/msg00008.html>.

* gnu/packages/xdisorg.scm (libdrm)[arguments]: Make 'check phase
unconditional.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/xdisorg.scm14
1 files changed, 6 insertions, 8 deletions
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index c034b50927..9fde0fcbd4 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