diff mbox

[01/13] gnu: kguiaddons: Fix regression caused by update to qt 5.7.

Message ID 20160821140825.13048-1-david@craven.ch
State New
Headers show

Commit Message

David Craven Aug. 21, 2016, 2:08 p.m. UTC
* gnu/packages/kde-frameworks.scm (kguiaddons)[arguments]:
Remove phase 'start-xorg-server. Add phase 'check-setup.
---
 gnu/packages/kde-frameworks.scm | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

Comments

Mark H Weaver Aug. 21, 2016, 7:44 p.m. UTC | #1
David Craven <david@craven.ch> writes:

> * gnu/packages/kde-frameworks.scm (kguiaddons)[arguments]:
> Remove phase 'start-xorg-server. Add phase 'check-setup.
> ---
>  gnu/packages/kde-frameworks.scm | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
> index af81547..ba26952 100644
> --- a/gnu/packages/kde-frameworks.scm
> +++ b/gnu/packages/kde-frameworks.scm
> @@ -539,12 +539,9 @@ infrastructure.")
>      (arguments
>       `(#:phases
>          (modify-phases %standard-phases
> -          (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 &"))
> -              (setenv "DISPLAY" ":1")
> +          (add-before 'check 'check-setup
> +            (lambda* _
> +              (setenv "QT_QPA_PLATFORM" "offscreen")
>               #t)))))

The #t should line up with (setenv ...), i.e. it should be moved one
column to the right.  Otherwise, looks good to me!

     Thanks,
       Mark
diff mbox

Patch

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index af81547..ba26952 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -539,12 +539,9 @@  infrastructure.")
     (arguments
      `(#:phases
         (modify-phases %standard-phases
-          (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 &"))
-              (setenv "DISPLAY" ":1")
+          (add-before 'check 'check-setup
+            (lambda* _
+              (setenv "QT_QPA_PLATFORM" "offscreen")
              #t)))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Utilities for graphical user interfaces")