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

[Hartmut Goebel]

htgoebel pushed a commit to branch master
in repository guix.

commit 9f5bd38f94fbde4806296756d77f887ffcb29b58
Author: Hartmut Goebel <address@hidden>
Date:   Tue Oct 31 18:21:17 2017 +0100

    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'.
---
 gnu/packages/kde-frameworks.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 6a46f28..59022f3 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -104,7 +104,11 @@
                 "_define_relative(QTQUICKIMPORTSDIR LIBDIR \"qt5/imports\"")
                ;; Install qml-files into lib/qt5/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
          ;; after testsuire has run
          (add-after 'install 'check-post-install