guix-commits
[Top][All Lists]
Advanced

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

02/04: gnu: qttools-5: Patch path to qmake for the lprodump command.


From: guix-commits
Subject: 02/04: gnu: qttools-5: Patch path to qmake for the lprodump command.
Date: Sat, 9 Mar 2024 19:57:49 -0500 (EST)

apteryx pushed a commit to branch master
in repository guix.

commit 59ff9d008816a7d04cdd50d0db371ae1223e3329
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Mar 9 16:49:55 2024 -0500

    gnu: qttools-5: Patch path to qmake for the lprodump command.
    
    This previously would lead to this cryptic error: "WARNING: Could not find
    qmake spec 'default'", which turned out to be caused by lprodump erroneously
    attempting to run 'qmake' from its own prefix (qmake is from the qtbase
    package, not qttools).
    
    * gnu/packages/qt.scm (qttools-5) [phases]
    <patch-qmake>: New phase.
    
    Change-Id: I6e9a2d35fec987451fd1e30b84a82023dbfd3316
---
 gnu/packages/qt.scm | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 761d12e31f..72c36513e9 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2171,7 +2171,18 @@ plugin for Adobe After Effects.")
                 "1bkx2sc5hyldarc7w76ymv7dlcna3ib9r2kp67jdqcf856bnrx36"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
-       ((#:tests? _ #f) #f)))           ; TODO: Enable the tests
+       ((#:tests? _ #f) #f)           ; TODO: Enable the tests
+       ((#:phases phases '%standard-phases)
+        #~(modify-phases #$phases
+            (add-after 'unpack 'patch-qmake
+              (lambda* (#:key inputs #:allow-other-keys)
+                ;; Adjust the default location of the 'qmake' command known to
+                ;; the 'lprodump' command, which would otherwise look for it
+                ;; in its own bindir.
+                (substitute* "src/linguist/lprodump/main.cpp"
+                  (("app.applicationDirPath\\() \\+ 
QLatin1String\\(\"/qmake\")")
+                   (format #f "QLatin1String(~s)"
+                           (search-input-file inputs "bin/qmake"))))))))))
     (native-inputs (list perl qtdeclarative-5 vulkan-headers))
     (inputs (list mesa qtbase-5))
     (synopsis "Qt Tools and Designer modules")



reply via email to

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