[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#33812] [PATCH 1/2] gnu: extra-cmake-modules: Fix install-path for p
From: |
Hartmut Goebel |
Subject: |
[bug#33812] [PATCH 1/2] gnu: extra-cmake-modules: Fix install-path for plugins. |
Date: |
Thu, 20 Dec 2018 15:17:19 +0100 |
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 49c986483..8997f0522 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\"")
--
2.13.7
- [bug#33812] [PATCH 1/2] gnu: extra-cmake-modules: Fix install-path for plugins.,
Hartmut Goebel <=