From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Subject: [PATCH] gnu: qtbase: Add search path specification for 'QMAKEPATH'. Date: Sun, 14 Aug 2016 14:14:11 +0800 Message-ID: <20160814061411.22314-1-iyzsong@gmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:34945) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bYogv-0007QI-Dx for guix-devel@gnu.org; Sun, 14 Aug 2016 02:14:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bYogr-0007fa-8I for guix-devel@gnu.org; Sun, 14 Aug 2016 02:14:36 -0400 Received: from mail2.openmailbox.org ([62.4.1.33]:38871) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bYogr-0007fP-28 for guix-devel@gnu.org; Sun, 14 Aug 2016 02:14:33 -0400 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org Cc: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= * 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 -- 2.8.4