nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: kde-framworks: Fix installation directories. 

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.
This commit is contained in:
Hartmut Goebel 2017-09-30 17:45:35 +02:00
parent 5430732b22
commit 61cc757d5f
No known key found for this signature in database
GPG Key ID: 634A8DFFD3F631DF
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/kde-frameworks.scm
View File

@ -92,7 +92,17 @@
(lambda _ (lambda _
;; Always install into /lib and not into /lib64. ;; Always install into /lib and not into /lib64.
(substitute* "kde-modules/KDEInstallDirs.cmake" (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 ;; install and check phase are swapped to prevent install from failing
;; after testsuire has run ;; after testsuire has run
(add-after 'install 'check-post-install (add-after 'install 'check-post-install
@ -1042,7 +1052,7 @@ configuration pages, message boxes, and password requests.")
(begin (begin
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(setenv "QT_PLUGIN_PATH" (setenv "QT_PLUGIN_PATH"
(string-append out "/lib/plugins:" (string-append out "/lib/qt5/plugins:"
(getenv "QT_PLUGIN_PATH")))) (getenv "QT_PLUGIN_PATH"))))
;; The test suite requires a running X server, setting ;; The test suite requires a running X server, setting
;; QT_QPA_PLATFORM=offscreen does not suffice and even make ;; QT_QPA_PLATFORM=offscreen does not suffice and even make
@ -1485,7 +1495,7 @@ from DocBook files.")
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(setenv "QT_PLUGIN_PATH" (setenv "QT_PLUGIN_PATH"
(string-append out "/lib/plugins:" (string-append out "/lib/qt5/plugins:"
(getenv "QT_PLUGIN_PATH")))) (getenv "QT_PLUGIN_PATH"))))
#t))))) #t)))))
(native-inputs (native-inputs