From 69b608618285d5c2d318feeb93b56c4d5a441ede Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 20 Dec 2018 11:50:07 +0100 Subject: [PATCH] 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]: 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 6c1854379a..0f3790367f 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\"")