From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38868) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e0RLU-0000dP-1l for guix-patches@gnu.org; Fri, 06 Oct 2017 08:03:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e0RLO-0006OU-C4 for guix-patches@gnu.org; Fri, 06 Oct 2017 08:03:12 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:43595) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e0RLO-0006OQ-8C for guix-patches@gnu.org; Fri, 06 Oct 2017 08:03:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1e0RLN-0006ea-WF for guix-patches@gnu.org; Fri, 06 Oct 2017 08:03:06 -0400 Subject: [bug#28719] [PATCH 6/6] gnu: kde-framworks: Fix installation directories. Resent-Message-ID: From: Hartmut Goebel Date: Fri, 6 Oct 2017 14:02:14 +0200 Message-Id: <20171006120214.29511-6-h.goebel@crazy-compilers.com> In-Reply-To: <20171006120214.29511-1-h.goebel@crazy-compilers.com> References: <20171006120214.29511-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 28719@debbugs.gnu.org After the qtbase installation directories have been changed, kf5's plugins etc. need to be install into lib/qt5/…, too. We change the global definitions in "KDEInstallDirs.cmake", so this changes will apply to all packages without these to need to define the paths. THis is okay, since "KDEInstallDirs.cmake" defines the directory-layout guix is using. * gnu/packages/kde-frameworks.scm (extra-cmake-modules)[#:phase fix-lib-path]: In modules/KDEInstallDirs.cmake also patch QTPLUGINDIR, QTQUICKIMPORTSDIR, QMLDIR. (kwindowsystem)[#:phase check]: Adjust QT_PLUGIN_PATH. (kfilemetadata)[#:phase check-setup]: dito. --- gnu/packages/kde-frameworks.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 58bc74236..a503226d6 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -92,7 +92,17 @@ (lambda _ ;; Always install into /lib and not into /lib64. (substitute* "kde-modules/KDEInstallDirs.cmake" - (("\"lib64\"") "\"lib\"")))) + (("\"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\"") + ;; Install imports into lib/qt5/imports + (("_define_relative\\(QTQUICKIMPORTSDIR QTPLUGINDIR \"imports\"") + "_define_relative(QTQUICKIMPORTSDIR LIBDIR \"qt5/imports\"") + ;; Install qml-files into lib/qt5/qml + (("_define_relative\\(QMLDIR LIBDIR \"qml\"") + "_define_relative(QMLDIR LIBDIR \"qt5/qml\"")))) ;; install and check phase are swapped to prevent install from failing ;; after testsuire has run (add-after 'install 'check-post-install @@ -1042,7 +1052,7 @@ configuration pages, message boxes, and password requests.") (begin (let ((out (assoc-ref outputs "out"))) (setenv "QT_PLUGIN_PATH" - (string-append out "/lib/plugins:" + (string-append out "/lib/qt5/plugins:" (getenv "QT_PLUGIN_PATH")))) ;; The test suite requires a running X server, setting ;; QT_QPA_PLATFORM=offscreen does not suffice and even make @@ -1485,7 +1495,7 @@ from DocBook files.") (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (setenv "QT_PLUGIN_PATH" - (string-append out "/lib/plugins:" + (string-append out "/lib/qt5/plugins:" (getenv "QT_PLUGIN_PATH")))) #t))))) (native-inputs -- 2.13.5