ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-27 14:52:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: python-shiboken-2: Use G-expressions.

Browse source 
* gnu/packages/qt.scm (python-shiboken-2)[arguments]: Use G-expressions.
<#:phases>: In phase "set-build-env", Replace (assoc-ref inputs ...) with
(this-package-input ...).

Signed-off-by: Marius Bakke <marius@gnu.org>
This commit is contained in:
Zhu Zihao 2022-08-24 16:50:14 +08:00 committed by Marius Bakke
parent 453cbb9f06
commit f1bbdefd9e
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 29 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/qt.scm
View file

@ -24,6 +24,7 @@
;;; Copyright © 2021, 2022 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2021, 2022 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021 Nicolò Balzarotti <nicolo@nixo.xyz> ;;; Copyright © 2021 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2022 Foo Chuan Wei <chuanwei.foo@hotmail.com> ;;; Copyright © 2022 Foo Chuan Wei <chuanwei.foo@hotmail.com>
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -3746,6 +3747,9 @@ (define-public qcustomplot
"QCustomPlot is a Qt C++ widget providing 2D plots, graphs and charts.") "QCustomPlot is a Qt C++ widget providing 2D plots, graphs and charts.")
(license license:gpl3+))) (license license:gpl3+)))
;; TODO: Split shiboken2 binding generator into a dedicated output.
;; This executable requires libxml2, libxslt, clang-toolchain at runtime.
;; The libshiboken library only requires Qt and Python at runtime.
(define-public python-shiboken-2 (define-public python-shiboken-2
(package (package
(name "python-shiboken-2") (name "python-shiboken-2")
@ -3768,11 +3772,12 @@ (define-public python-shiboken-2
qtbase-5 qtbase-5
qtxmlpatterns)) qtxmlpatterns))
(arguments (arguments
`(#:tests? #f (list
#:tests? #f
;; FIXME: Building tests fails ;; FIXME: Building tests fails
#:configure-flags '("-DBUILD_TESTS=off") #:configure-flags #~(list "-DBUILD_TESTS=off")
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'use-shiboken-dir-only (add-after 'unpack 'use-shiboken-dir-only
(lambda _ (chdir "sources/shiboken2") #t)) (lambda _ (chdir "sources/shiboken2") #t))
(add-before 'configure 'make-files-writable-and-update-timestamps (add-before 'configure 'make-files-writable-and-update-timestamps
@ -3788,8 +3793,8 @@ (define-public python-shiboken-2
(find-files "."))) (find-files ".")))
#t)) #t))
(add-before 'configure 'set-build-env (add-before 'configure 'set-build-env
(lambda* (#:key inputs #:allow-other-keys) (lambda _
(let ((llvm (assoc-ref inputs "clang-toolchain"))) (let ((llvm #$(this-package-input "clang-toolchain")))
(setenv "CLANG_INSTALL_DIR" llvm) (setenv "CLANG_INSTALL_DIR" llvm)
#t)))))) #t))))))
(home-page "https://wiki.qt.io/Qt_for_Python") (home-page "https://wiki.qt.io/Qt_for_Python")