guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

05/23: gnu: qscintilla: Adjust installation directory layout.


From: Hartmut Goebel
Subject: 05/23: gnu: qscintilla: Adjust installation directory layout.
Date: Fri, 22 Sep 2017 09:30:26 -0400 (EDT)

htgoebel pushed a commit to branch wip-qt-paths
in repository guix.

commit 377f33426fe2d561d7c78d97886f97452c8684e4
Author: Hartmut Goebel <address@hidden>
Date:   Sun Sep 3 11:36:42 2017 +0200

    gnu: qscintilla: Adjust installation directory layout.
    
    * gnu/packages/qt.scm (qscintilla)[#:phase configure]: Set QT_INSTALL_DATA 
and
      QT_HOST_DATA to $OUT/lib/qt5.
---
 gnu/packages/qt.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 263e025..b08c034 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1455,8 +1455,10 @@ contain over 620 classes.")
                   (string-append out "/include"))
                  (("\\$\\$\\[QT_INSTALL_TRANSLATIONS\\]")
                   (string-append out "/translations"))
-                 (("\\$\\$\\[QT_INSTALL_DATA\\]") out)
-                 (("\\$\\$\\[QT_HOST_DATA\\]") out))
+                 (("\\$\\$\\[QT_INSTALL_DATA\\]")
+                  (string-append out "/lib/qt$${QT_MAJOR_VERSION}"))
+                 (("\\$\\$\\[QT_HOST_DATA\\]")
+                 (string-append out "/lib/qt$${QT_MAJOR_VERSION}")))
                (zero? (system* "qmake"))))))))
     (native-inputs `(("qtbase" ,qtbase)))
     (home-page "http://www.riverbankcomputing.co.uk/software/qscintilla/intro";)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]