[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/29: gnu: qscintilla: Adjust installation directory layout.
From: |
Hartmut Goebel |
Subject: |
05/29: gnu: qscintilla: Adjust installation directory layout. |
Date: |
Fri, 6 Oct 2017 08:15:06 -0400 (EDT) |
htgoebel pushed a commit to branch wip-qt-paths
in repository guix.
commit ffb567a8142b2ad8067766c250e9e8607f337555
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 1b5058b..7759827 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1467,8 +1467,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")
- 04/29: gnu: qtwebkit: Fix rpath for the qmlwebkit plugins., (continued)
- 04/29: gnu: qtwebkit: Fix rpath for the qmlwebkit plugins., Hartmut Goebel, 2017/10/06
- 12/29: gnu: kwallet: Add optional input qgpgme., Hartmut Goebel, 2017/10/06
- 24/29: gnu: sonnet: Reduce the number of warnings when configuring., Hartmut Goebel, 2017/10/06
- 26/29: gnu: kdeclarative: Reduce the number of warnings when configuring., Hartmut Goebel, 2017/10/06
- 25/29: gnu: kglobalaccel: Reduce the number of warnings when configuring., Hartmut Goebel, 2017/10/06
- 22/29: gnu: kio: Symlink some files referred to by different names., Hartmut Goebel, 2017/10/06
- 18/29: gnu: bluez-qt: Add comment about status of tests., Hartmut Goebel, 2017/10/06
- 17/29: gnu: bluez-qt: Install udev-rules., Hartmut Goebel, 2017/10/06
- 15/29: gnu: kdnssd: Enable service discovery on local network via avahi., Hartmut Goebel, 2017/10/06
- 21/29: gnu: kio: Adopt a patch from Nix., Hartmut Goebel, 2017/10/06
- 05/29: gnu: qscintilla: Adjust installation directory layout.,
Hartmut Goebel <=
- 29/29: gnu: kdoctools: Symlink some files referred to by different names., Hartmut Goebel, 2017/10/06