01/02: gnu: extra-cmake-modules: Fix install-path for plugins.

[guix-commits]

htgoebel pushed a commit to branch master
in repository guix.

commit 69b608618285d5c2d318feeb93b56c4d5a441ede
Author: Hartmut Goebel <address@hidden>
Date:   Thu Dec 20 11:50:07 2018 +0100

    gnu: extra-cmake-modules: Fix install-path for plugins.
    
    The respective entry changed for kde-frameworks 5.46.
    
    * gnu/packages/kde-frameworks.scm(krunner)[#phases]<fix-lib-path>:
      Change substitute for QTPLUGINDIR.
---
 gnu/packages/kde-frameworks.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 6c18543..0f37903 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -98,8 +98,10 @@
                (("\"lib64\"") "\"lib\"")
                ;; TODO: Base the following on values taken from Qt
                ;; Install plugins into lib/qt5/plugins
-               (("_define_relative\\(QTPLUGINDIR LIBDIR \"plugins\"")
-                "_define_relative(QTPLUGINDIR LIBDIR \"qt5/plugins\"")
+               ;; TODO: Check if this is okay for Android, too
+               ;; (see comment in KDEInstallDirs.cmake)
+               (("_define_relative\\(QTPLUGINDIR \"\\$\\{_pluginsDirParent}\" 
\"plugins\"")
+                "_define_relative(QTPLUGINDIR \"${_pluginsDirParent}\" 
\"qt5/plugins\"")
                ;; Install imports into lib/qt5/imports
                (("_define_relative\\(QTQUICKIMPORTSDIR QTPLUGINDIR 
\"imports\"")
                 "_define_relative(QTQUICKIMPORTSDIR LIBDIR \"qt5/imports\"")