[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
16/22: gnu: python-pyside-2: Use "this-package-input" instead of "assoc-
From: |
guix-commits |
Subject: |
16/22: gnu: python-pyside-2: Use "this-package-input" instead of "assoc-ref". |
Date: |
Wed, 7 Sep 2022 16:04:15 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit 5c08546558f97e9ce665a83724b0e9d1751abac0
Author: Zhu Zihao <all_but_last@163.com>
AuthorDate: Wed Aug 24 22:57:44 2022 +0800
gnu: python-pyside-2: Use "this-package-input" instead of "assoc-ref".
* gnu/packages/qt.scm (python-pyside-2)[arguments]<#:configure-flags>: Use
SEARCH-INPUT-FILE.
<#:phases>: In phase "fix-qt-module-detection", use "this-package-input".
Signed-off-by: Marius Bakke <marius@gnu.org>
---
gnu/packages/qt.scm | 48 +++++++++++++++++++++++++-----------------------
1 file changed, 25 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index d92f4ef852..2ebfe42abe 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -3880,8 +3880,8 @@ color-related widgets.")
#:configure-flags
#~(list "-DBUILD_TESTS=FALSE"
(string-append "-DPYTHON_EXECUTABLE="
- (assoc-ref %build-inputs "python")
- "/bin/python"))
+ (search-input-file %build-inputs
+ "/bin/python")))
#:modules '((guix build cmake-build-system)
(guix build utils)
(srfi srfi-1))
@@ -3890,33 +3890,35 @@ color-related widgets.")
(add-after 'unpack 'go-to-source-dir
(lambda _ (chdir "sources/pyside2") #t))
(add-after 'go-to-source-dir 'fix-qt-module-detection
- (lambda* (#:key inputs #:allow-other-keys)
+ (lambda _
;; Activate qt module support even if it not in the same
;; directory as qtbase.
(substitute* "../cmake_helpers/helpers.cmake"
(("\\(\"\\$\\{found_basepath\\}\" GREATER \"0\"\\)")
"true"))
;; Add include directories for qt modules.
- (let ((dirs (map (lambda (name)
- (string-append (assoc-ref inputs name)
- "/include/qt5"))
- '("qtdatavis3d"
- "qtdeclarative"
- "qtlocation"
- "qtmultimedia"
- "qtquickcontrols"
- "qtquickcontrols2"
- "qtscript"
- "qtscxml"
- "qtsensors"
- "qtspeech"
- "qtsvg"
- "qttools"
- "qtwebchannel"
- "qtwebengine"
- "qtwebsockets"
- "qtx11extras"
- "qtxmlpatterns"))))
+ (let ((dirs (map (lambda (path)
+ (string-append path "/include/qt5"))
+ (list
+ #$@(map (lambda (name)
+ (this-package-input name))
+ '("qtdatavis3d"
+ "qtdeclarative"
+ "qtlocation"
+ "qtmultimedia"
+ "qtquickcontrols"
+ "qtquickcontrols2"
+ "qtscript"
+ "qtscxml"
+ "qtsensors"
+ "qtspeech"
+ "qtsvg"
+ "qttools"
+ "qtwebchannel"
+ "qtwebengine"
+ "qtwebsockets"
+ "qtx11extras"
+ "qtxmlpatterns"))))))
(substitute* "cmake/Macros/PySideModules.cmake"
(("\\$\\{PATH_SEP\\}\\$\\{core_includes\\}" all)
(fold (lambda (dir paths)
- 21/22: gnu: f3d: Update to 1.3.1., (continued)
- 21/22: gnu: f3d: Update to 1.3.1., guix-commits, 2022/09/07
- 04/22: gnu: font-lxgw-wenkai: Update to 1.240., guix-commits, 2022/09/07
- 15/22: gnu: python-pyside-2: Clarify the package inputs., guix-commits, 2022/09/07
- 19/22: gnu: python-pyside-2-tools: Fix synopsis and description., guix-commits, 2022/09/07
- 10/22: gnu: ytfzf: Update to 2.4.1., guix-commits, 2022/09/07
- 14/22: gnu: python-pyside-2: Use G-expressions., guix-commits, 2022/09/07
- 18/22: gnu: python-pyside-2-tools: Use G-expressions., guix-commits, 2022/09/07
- 17/22: gnu: Add python-pyside-6., guix-commits, 2022/09/07
- 22/22: gnu: uBlock Origin: Update to 1.44.2., guix-commits, 2022/09/07
- 20/22: gnu: python-sympy: Update to 1.11.1., guix-commits, 2022/09/07
- 16/22: gnu: python-pyside-2: Use "this-package-input" instead of "assoc-ref".,
guix-commits <=