aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHartmut Goebel <h.goebel@crazy-compilers.com>2017-09-03 11:36:42 +0200
committerHartmut Goebel <h.goebel@crazy-compilers.com>2017-10-13 13:53:39 +0200
commit5430732b22dcee5ae162826ee1dfefb9510eaeca (patch)
tree42276802fd69a002ecf4a38cf28cab5dd93c05cf
parent4eb972b95cbb9fa6c27283dd4b4ec9581838e85e (diff)
downloadguix-5430732b22dcee5ae162826ee1dfefb9510eaeca.tar.gz
guix-5430732b22dcee5ae162826ee1dfefb9510eaeca.zip
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.
-rw-r--r--gnu/packages/qt.scm6
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 4df2674fea..2dd1d832bc 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1673,8 +1673,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")