[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
14/36: gnu: qtbase: Add search path specification for 'QMAKEPATH'.
From: |
David Craven |
Subject: |
14/36: gnu: qtbase: Add search path specification for 'QMAKEPATH'. |
Date: |
Thu, 18 Aug 2016 15:58:29 +0000 (UTC) |
dvc pushed a commit to branch master
in repository guix.
commit 5ca6ef95f4299524117743974d8dfd8dde442ba5
Author: 宋文武 <address@hidden>
Date: Sun Aug 14 14:14:11 2016 +0800
gnu: qtbase: Add search path specification for 'QMAKEPATH'.
* gnu/packages/qt.scm (qtbase)[native-search-paths]: New field.
[arguments]: Add phase to patch 'qt_config.prf'.
---
gnu/packages/qt.scm | 31 ++++++++++++++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index a35c337..a12c526 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -445,7 +445,36 @@ developers using C++ or QML, a CSS & JavaScript like
language.")
"-no-avx"
"-no-avx2"
"-no-mips_dsp"
- "-no-mips_dspr2"))))))))
+ "-no-mips_dspr2")))))
+ (add-after 'install 'patch-qt_config.prf
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (qt_config.prf (string-append
+ out "/mkspecs/features/qt_config.prf")))
+ ;; For each Qt module, let `qmake' uses search paths in the
+ ;; module directory instead of all in QT_INSTALL_PREFIX.
+ (substitute* qt_config.prf
+ (("\\$\\$\\[QT_INSTALL_HEADERS\\]")
+ "$$replace(dir, mkspecs/modules, include)")
+ (("\\$\\$\\[QT_INSTALL_LIBS\\]")
+ "$$replace(dir, mkspecs/modules, lib)")
+ (("\\$\\$\\[QT_HOST_LIBS\\]")
+ "$$replace(dir, mkspecs/modules, lib)")
+ (("\\$\\$\\[QT_INSTALL_PLUGINS\\]")
+ "$$replace(dir, mkspecs/modules, plugins)")
+ (("\\$\\$\\[QT_INSTALL_LIBEXECS\\]")
+ "$$replace(dir, mkspecs/modules, libexec)")
+ (("\\$\\$\\[QT_INSTALL_BINS\\]")
+ "$$replace(dir, mkspecs/modules, bin)")
+ (("\\$\\$\\[QT_INSTALL_IMPORTS\\]")
+ "$$replace(dir, mkspecs/modules, imports)")
+ (("\\$\\$\\[QT_INSTALL_QML\\]")
+ "$$replace(dir, mkspecs/modules, qml)"))
+ #t))))))
+ (native-search-paths
+ (list (search-path-specification
+ (variable "QMAKEPATH")
+ (files '("")))))
(home-page "https://www.qt.io/")
(synopsis "Cross-platform GUI library")
(description "Qt is a cross-platform application and UI framework for
- 09/36: gnu: Add knotifications., (continued)
- 09/36: gnu: Add knotifications., David Craven, 2016/08/18
- 01/36: gnu: Add phonon., David Craven, 2016/08/18
- 19/36: gnu: Add yaml-cpp., David Craven, 2016/08/18
- 12/36: gnu: Add kunitconversion., David Craven, 2016/08/18
- 20/36: gnu: Add jsoncpp., David Craven, 2016/08/18
- 25/36: gnu: networkmanager-qt: Propagate network-manager., David Craven, 2016/08/18
- 31/36: gnu: bitcoin-core: Use modular qt., David Craven, 2016/08/18
- 36/36: gnu: gstreamer: Use license: prefix., David Craven, 2016/08/18
- 15/36: gnu: Add qtquickcontrols., David Craven, 2016/08/18
- 07/36: gnu: Add kimageformats., David Craven, 2016/08/18
- 14/36: gnu: qtbase: Add search path specification for 'QMAKEPATH'.,
David Craven <=
- 22/36: gnu: Add lndir., David Craven, 2016/08/18
- 21/36: gnu: Add snappy., David Craven, 2016/08/18
- 29/36: gnu: qsynth: Use modular qt., David Craven, 2016/08/18
- 35/36: gnu: qt: Update qt to 5.7.0., David Craven, 2016/08/18
- 33/36: gnu: poppler-qt5: Use modular qt., David Craven, 2016/08/18
- 04/36: gnu: Add kcrash., David Craven, 2016/08/18
- 16/36: gnu: Add qtquickcontrols2., David Craven, 2016/08/18
- 02/36: gnu: Add kauth., David Craven, 2016/08/18
- 11/36: gnu: Add kpty., David Craven, 2016/08/18
- 18/36: gnu: Add lmdb., David Craven, 2016/08/18