diff mbox series

[bug#38319,2/4] guix: Fix wrap-qt-program.

Message ID 20191122093730.6164-2-h.goebel@crazy-compilers.com
State Accepted
Headers show
Series Fix wrap-qt-program some packages using Qt | expand

Commit Message

Hartmut Goebel Nov. 22, 2019, 9:37 a.m. UTC 
Paths added here need to match qtbase's native-search-path specifications.

* guix/build/qt-utils.scm(wrap-qt-program): Change paths used for
  QML2_IMPORT_PATH and QT_PLUGIN_PATH.
---
 guix/build/qt-utils.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Ludovic Courtès Nov. 25, 2019, 10:37 p.m. UTC | #1 
Hello,

Hartmut Goebel <h.goebel@crazy-compilers.com> skribis:

> Paths added here need to match qtbase's native-search-path specifications.
  ^~~~~

“File names” or “directory names”.

> * guix/build/qt-utils.scm(wrap-qt-program): Change paths used for
                           ^
Missing space.  :-)

LGTM!

If I’m not mistaken, less than a dozen of packages depend on this file,
right?  If that’s the case, this can go to master.

Thanks,
Ludo’.
diff mbox series

Patch

diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm
index 48a32674e9..d2486ee86c 100644
--- a/guix/build/qt-utils.scm
+++ b/guix/build/qt-utils.scm
@@ -26,9 +26,9 @@ 
       (if env-val (string-append env-val ":" path) path)))
 
   (let ((qml-path        (suffix "QML2_IMPORT_PATH"
-                                 (string-append out "/qml")))
+                                 (string-append out "/lib/qt5/qml")))
         (plugin-path     (suffix "QT_PLUGIN_PATH"
-                                 (string-append out "/plugins")))
+                                 (string-append out "/lib/qt5/plugins")))
         (xdg-data-path   (suffix "XDG_DATA_DIRS"
                                  (string-append out "/share")))
         (xdg-config-path (suffix "XDG_CONFIG_DIRS"