guix: Fix wrap-qt-program.
authorHartmut Goebel <h.goebel@crazy-compilers.com>
Fri, 22 Nov 2019 08:25:56 +0000 (09:25 +0100)
committerHartmut Goebel <h.goebel@crazy-compilers.com>
Tue, 26 Nov 2019 11:31:39 +0000 (12:31 +0100)
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.

guix/build/qt-utils.scm

index 48a3267..d2486ee 100644 (file)
@@ -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"