guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/04: gnu: qoauth: Minor cosmetic improvements.


From: guix-commits
Subject: 03/04: gnu: qoauth: Minor cosmetic improvements.
Date: Mon, 7 Dec 2020 18:46:26 -0500 (EST)

mbakke pushed a commit to branch master
in repository guix.

commit adf0edadef9a60766f5786ab789d26a8248ab4d4
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Tue Dec 8 00:30:08 2020 +0100

    gnu: qoauth: Minor cosmetic improvements.
    
    * gnu/packages/web.scm (qoauth)[arguments]: Add #:tests?.  Don't delete
    'check' phase.  Override 'configure' instead of adding new phase.
---
 gnu/packages/web.scm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 5c52a32..ff40743 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -1063,7 +1063,8 @@ instances, while JSON's objects will be mapped to 
@code{QVariantMap}.")
      `(("qca" ,qca)
        ("qtbase" ,qtbase)))
     (arguments
-     '(#:phases
+     '(#:tests? #f                      ;FIXME: some tests are failing
+       #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-code
            (lambda _
@@ -1079,11 +1080,9 @@ instances, while JSON's objects will be mapped to 
@code{QVariantMap}.")
                (("\\$\\$\\[QMAKE_MKSPECS\\]")
                 (string-append (assoc-ref outputs "out") "/lib/qt5/mkspecs")))
              #t))
-         (delete 'configure) ; no configure script
-         (delete 'check) ; no test target
-         (add-before 'build 'qmake
-           (lambda _
-             (let ((qca (assoc-ref %build-inputs "qca")))
+         (replace 'configure
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((qca (assoc-ref inputs "qca")))
                (invoke
                 "qmake"
                 (string-append "PREFIX=" (assoc-ref %outputs "out"))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]