guix-commits
[Top][All Lists]
Advanced

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

02/04: gnu: qoauth: Fix build failure.


From: guix-commits
Subject: 02/04: gnu: qoauth: Fix build failure.
Date: Mon, 7 Dec 2020 18:46:26 -0500 (EST)

mbakke pushed a commit to branch master
in repository guix.

commit 627b70e3ac8aade9744a998c28570fbb52b986a7
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Tue Dec 8 00:28:06 2020 +0100

    gnu: qoauth: Fix build failure.
    
    Fixes <https://bugs.gnu.org/45031>.
    Reported by Distopico <distopico@riseup.net>.
    
    * gnu/packages/web.scm (qoauth)[arguments]: Add phase
    'adjust-mkspecs-directory'.
---
 gnu/packages/web.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 794e2c9..5c52a32 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -1071,6 +1071,14 @@ instances, while JSON's objects will be mapped to 
@code{QVariantMap}.")
              (substitute* "src/src.pro"
                (("/lib64") "/lib"))
              #t))
+         (add-after 'unpack 'adjust-mkspecs-directory
+           (lambda* (#:key outputs #:allow-other-keys)
+             (substitute* "src/src.pro"
+               ;; Do not attempt to install the .prf file into qtbase
+               ;; "lib/mkspecs/features", ref <https://bugs.gnu.org/45301>.
+               (("\\$\\$\\[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



reply via email to

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