[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
14/22: gnu: python-pyside-2: Use G-expressions.
|
From: |
guix-commits |
|
Subject: |
14/22: gnu: python-pyside-2: Use G-expressions. |
|
Date: |
Wed, 7 Sep 2022 16:04:14 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit 00652ce2eef7051c277d8f53c4c43acc4eb98b34
Author: Zhu Zihao <all_but_last@163.com>
AuthorDate: Wed Aug 24 19:25:26 2022 +0800
gnu: python-pyside-2: Use G-expressions.
* gnu/packages/qt.scm (python-pyside-2)[native-inputs]: Use label-less input
style.
[arguments]: Use G-expressions.
Signed-off-by: Marius Bakke <marius@gnu.org>
---
gnu/packages/qt.scm | 116 ++++++++++++++++++++++++++--------------------------
1 file changed, 57 insertions(+), 59 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 80e2a26693..d496f69107 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -3874,68 +3874,66 @@ color-related widgets.")
(propagated-inputs
(list python-shiboken-2))
(native-inputs
- `(("cmake" ,cmake-minimal)
- ("python" ,python-wrapper)
- ("qttools-5" ,qttools-5)
- ("which" ,which)))
+ (list cmake-minimal python-wrapper qttools-5 which))
(arguments
- `(#:tests? #f
- ;; FIXME: Building tests fail.
- #:configure-flags
- (list "-DBUILD_TESTS=FALSE"
- (string-append "-DPYTHON_EXECUTABLE="
- (assoc-ref %build-inputs "python")
- "/bin/python"))
- #:modules ((guix build cmake-build-system)
+ (list
+ #:tests? #f
+ ;; FIXME: Building tests fail.
+ #:configure-flags
+ #~(list "-DBUILD_TESTS=FALSE"
+ (string-append "-DPYTHON_EXECUTABLE="
+ (assoc-ref %build-inputs "python")
+ "/bin/python"))
+ #:modules '((guix build cmake-build-system)
(guix build utils)
(srfi srfi-1))
- #:phases
- (modify-phases %standard-phases
- (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)
- ;; 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-5"
- "qtwebchannel"
- "qtwebengine"
- "qtwebsockets"
- "qtx11extras"
- "qtxmlpatterns"))))
- (substitute* "cmake/Macros/PySideModules.cmake"
- (("\\$\\{PATH_SEP\\}\\$\\{core_includes\\}" all)
- (fold (lambda (dir paths)
- (string-append paths "${PATH_SEP}" dir))
- all
- dirs)))
- (setenv "CXXFLAGS" (fold (lambda (dir paths)
- (string-append paths " -I" dir))
- ""
- dirs)))))
- (add-before 'configure 'set-clang-dir
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((clang (assoc-ref inputs "clang-toolchain")))
- (setenv "CLANG_INSTALL_DIR" clang)
- #t))))))
+ #:phases
+ #~(modify-phases %standard-phases
+ (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)
+ ;; 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"))))
+ (substitute* "cmake/Macros/PySideModules.cmake"
+ (("\\$\\{PATH_SEP\\}\\$\\{core_includes\\}" all)
+ (fold (lambda (dir paths)
+ (string-append paths "${PATH_SEP}" dir))
+ all
+ dirs)))
+ (setenv "CXXFLAGS" (fold (lambda (dir paths)
+ (string-append paths " -I" dir))
+ ""
+ dirs)))))
+ (add-before 'configure 'set-clang-dir
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((clang (assoc-ref inputs "clang-toolchain")))
+ (setenv "CLANG_INSTALL_DIR" clang)
+ #t))))))
(home-page "https://wiki.qt.io/Qt_for_Python";)
(synopsis
"The Qt for Python product enables the use of Qt5 APIs in Python
applications")
- 12/22: gnu: python-shiboken-2: Use G-expressions., (continued)
- 12/22: gnu: python-shiboken-2: Use G-expressions., guix-commits, 2022/09/07
- 03/22: gnu: sqlite-next: Update to 3.39.3., guix-commits, 2022/09/07
- 02/22: gnu: python-apsw: Update to 3.39.2.1., guix-commits, 2022/09/07
- 07/22: gnu: gnunet-scheme: Update to 0.3., guix-commits, 2022/09/07
- 13/22: gnu: Add python-shiboken-6, guix-commits, 2022/09/07
- 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 <=
- 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, 2022/09/07