[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 08:55:30 -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")
- branch wip-qt-paths created (now 61f485a), Hartmut Goebel, 2017/09/22
- 03/23: gnu: qwt: Adjust installation directory layout., Hartmut Goebel, 2017/09/22
- 04/23: gnu: qtwebkit: Fix rpath for the qmlwebkit plugins., Hartmut Goebel, 2017/09/22
- 05/23: gnu: qscintilla: Adjust installation directory layout.,
Hartmut Goebel <=
- 02/23: gnu: qt: Fix install paths in submodules., Hartmut Goebel, 2017/09/22
- 06/23: gnu: grantlee: Enable all tests., Hartmut Goebel, 2017/09/22
- 10/23: gnu: kconfigwidgets: Add optional native-input kdoctools., Hartmut Goebel, 2017/09/22
- 07/23: gnu: qtkeychain: Reduce the number of warnings when configuring., Hartmut Goebel, 2017/09/22
- 18/23: gnu: kparts: Make tests pass again., Hartmut Goebel, 2017/09/22
- 13/23: gnu: phonon: Enable building the Qt Designer plugin., Hartmut Goebel, 2017/09/22
- 17/23: gnu: bluez-qt: Add comment about status of tests., Hartmut Goebel, 2017/09/22
- 16/23: gnu: bluez-qt: Install udev-rules., Hartmut Goebel, 2017/09/22
- 12/23: gnu: kdesignerplugin: Add optional inputs., Hartmut Goebel, 2017/09/22
- 08/23: gnu: Update prison to 5.37.0., Hartmut Goebel, 2017/09/22