summary refs log tree commit diff
diff options
context:
space:
mode:
authorHartmut Goebel <h.goebel@crazy-compilers.com>2019-11-22 09:25:56 +0100
committerHartmut Goebel <h.goebel@crazy-compilers.com>2019-11-26 12:31:39 +0100
commitd1e4e64cd788b2a7179d0ca5e5c5d3a4518bfa51 (patch)
tree64593c41f6c07bfa16a83547c58925501737bdeb
parent8ebf4e3a71d945b95fc917fbdde096ef4e07a9e6 (diff)
downloadguix-d1e4e64cd788b2a7179d0ca5e5c5d3a4518bfa51.tar.gz
guix: Fix wrap-qt-program.
Directory names 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.
-rw-r--r--guix/build/qt-utils.scm4
1 files changed, 2 insertions, 2 deletions
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"