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

gnu: extra-cmake-modules: Install pri-files into lib/qt5/. 

This in accordance with the documentation in
ECMGeneratePriFile.cmake: "Packagers … want to set
`ECM_MKSPECS_INSTALL_DIR` to something like
`share/qt5/mkspecs/modules`." Our Qt5 is putting pri-files into
`lib/qt5/mkspecs/modules`.

* gnu/packages/kde-frameworks.scm(extra-cmake-modules)[#:phase fix-lib-path]:
  New substitute for file 'modules/ECMGeneratePriFile.cmake'.
This commit is contained in:
Hartmut Goebel 2017-10-31 18:21:17 +01:00
parent 46dea1241c
commit 9f5bd38f94
No known key found for this signature in database
GPG Key ID: 634A8DFFD3F631DF
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,7 +104,11 @@
"_define_relative(QTQUICKIMPORTSDIR LIBDIR \"qt5/imports\"") "_define_relative(QTQUICKIMPORTSDIR LIBDIR \"qt5/imports\"")
;; Install qml-files into lib/qt5/qml ;; Install qml-files into lib/qt5/qml
(("_define_relative\\(QMLDIR LIBDIR \"qml\"") (("_define_relative\\(QMLDIR LIBDIR \"qml\"")
"_define_relative(QMLDIR LIBDIR \"qt5/qml\"")))) "_define_relative(QMLDIR LIBDIR \"qt5/qml\""))
(substitute* "modules/ECMGeneratePriFile.cmake"
;; Install pri-files into lib/qt5/mkspecs
(("set\\(ECM_MKSPECS_INSTALL_DIR mkspecs/modules")
"set(ECM_MKSPECS_INSTALL_DIR lib/qt5/mkspecs/modules"))))
;; 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