diff options
| -rw-r--r-- | gnu/packages/education.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/freedesktop.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/geo.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/graphics.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/java-graphics.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/kde-frameworks.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/kde-multimedia.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/kde-plasma.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/radio.scm | 3 |
9 files changed, 10 insertions, 20 deletions
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 91ccfd8ca7..efe210e1ec 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -157,8 +157,7 @@ of categories with some of the activities available in that category. (add-before 'check 'start-xorg-server (lambda* (#:key inputs #:allow-other-keys) ;; The test suite requires a running X server. - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 &")) + (system "Xvfb :1 &") (setenv "DISPLAY" ":1") ;; The test suite wants to write to /homeless-shelter (setenv "HOME" (getcwd)) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 5c76e6b8f0..3e052a5697 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1134,8 +1134,7 @@ protocol either in Wayland core, or some other protocol in wayland-protocols.") (add-before 'check 'start-xorg-server (lambda* (#:key inputs #:allow-other-keys) ;; The test suite requires a running X server. - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 &")) + (system "Xvfb :1 &") (setenv "DISPLAY" ":1") #t))))) (home-page "https://wayland.freedesktop.org") diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 37be78edbf..61c104fdfb 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2138,8 +2138,7 @@ growing set of geoscientific methods.") (replace 'check (lambda* (#:key inputs #:allow-other-keys) (setenv "HOME" "/tmp") - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 &")) + (system "Xvfb :1 &") (setenv "DISPLAY" ":1") (setenv "TRAVIS" "true") (setenv "CTEST_OUTPUT_ON_FAILURE" "1") diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 70b0c18793..ca88acf0ec 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1708,8 +1708,7 @@ requirements.") (add-before 'check 'start-xorg-server (lambda* (#:key inputs #:allow-other-keys) ;; The test suite requires a running X server. - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 &")) + (system "Xvfb :1 &") (setenv "DISPLAY" ":1") #t))))) (native-inputs diff --git a/gnu/packages/java-graphics.scm b/gnu/packages/java-graphics.scm index f7a89021cd..960579f770 100644 --- a/gnu/packages/java-graphics.scm +++ b/gnu/packages/java-graphics.scm @@ -75,8 +75,7 @@ libraries.") (add-before 'check 'start-xorg-server (lambda* (#:key inputs #:allow-other-keys) ;; The test suite requires a running X server. - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 -screen 0 640x480x24 &")) + (system "Xvfb :1 -screen 0 640x480x24 &") (setenv "DISPLAY" ":1") #t))))) (inputs diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 7a3b6b26a8..4fd0817753 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1641,8 +1641,7 @@ integrated it into your application's other widgets.") ;; Xvfb doesn't have proper glx support and needs a pixeldepth ;; of 24 bit to avoid "libGL error: failed to load driver: swrast" ;; "Could not initialize GLX" - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 -screen 0 640x480x24 &")) + (system "Xvfb :1 -screen 0 640x480x24 &") (setenv "DISPLAY" ":1") #t))))) (home-page "https://community.kde.org/Frameworks") @@ -2386,8 +2385,7 @@ their settings.") (lambda* (#:key inputs #:allow-other-keys) ;; The test suite requires a running X server, setting ;; QT_QPA_PLATFORM=offscreen does not suffice. - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 -screen 0 640x480x24 &")) + (system "Xvfb :1 -screen 0 640x480x24 &") (setenv "DISPLAY" ":1") #t))))) (home-page "https://community.kde.org/Frameworks") diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 21ca996246..4e28fe1367 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -186,8 +186,7 @@ This package is part of the KDE multimedia module.") (lambda* (#:key inputs #:allow-other-keys) ;; The test suite requires a running X server, setting ;; QT_QPA_PLATFORM=offscreen does not suffice. - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 -screen 0 640x480x24 &")) + (system "Xvfb :1 -screen 0 640x480x24 &") (setenv "DISPLAY" ":1") #t)) (replace 'check diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index b7a2b14f65..96e7ec6907 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -154,8 +154,7 @@ call it if it is not associated to a terminal.") (modify-phases %standard-phases (add-before 'check 'check-setup (lambda* (#:key inputs outputs #:allow-other-keys) - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 -screen 0 640x480x24 &")) + (system "Xvfb :1 -screen 0 640x480x24 &") (setenv "DISPLAY" ":1") #t)) (delete 'check) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index e518b78815..6947c50520 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -579,8 +579,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") (add-before 'check 'set-test-environment (lambda* (#:key inputs #:allow-other-keys) (setenv "HOME" "/tmp") - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 &")) + (system "Xvfb :1 &") (setenv "DISPLAY" ":1") #t)) (replace 'check |