me/guix
Archived
1
0
Fork 0
Code Activity

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

Browse source 
* 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>
This commit is contained in:
Zhu Zihao 2022-08-24 19:25:26 +08:00 • committed by Marius Bakke
parent a69581f17c
commit 00652ce2ee
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 57 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

116
gnu/packages/qt.scm
View file

@ -3874,68 +3874,66 @@ color-related widgets.")
(propagated-inputs (propagated-inputs
(list python-shiboken-2)) (list python-shiboken-2))
(native-inputs (native-inputs
`(("cmake" ,cmake-minimal) (list cmake-minimal python-wrapper qttools-5 which))
("python" ,python-wrapper)
("qttools-5" ,qttools-5)
("which" ,which)))
(arguments (arguments
`(#:tests? #f (list
;; FIXME: Building tests fail. #:tests? #f
#:configure-flags ;; FIXME: Building tests fail.
(list "-DBUILD_TESTS=FALSE" #:configure-flags
(string-append "-DPYTHON_EXECUTABLE=" #~(list "-DBUILD_TESTS=FALSE"
(assoc-ref %build-inputs "python") (string-append "-DPYTHON_EXECUTABLE="
"/bin/python")) (assoc-ref %build-inputs "python")
#:modules ((guix build cmake-build-system) "/bin/python"))
#:modules '((guix build cmake-build-system)
(guix build utils) (guix build utils)
(srfi srfi-1)) (srfi srfi-1))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'go-to-source-dir (add-after 'unpack 'go-to-source-dir
(lambda _ (chdir "sources/pyside2") #t)) (lambda _ (chdir "sources/pyside2") #t))
(add-after 'go-to-source-dir 'fix-qt-module-detection (add-after 'go-to-source-dir 'fix-qt-module-detection
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Activate qt module support even if it not in the same ;; Activate qt module support even if it not in the same
;; directory as qtbase. ;; directory as qtbase.
(substitute* "../cmake_helpers/helpers.cmake" (substitute* "../cmake_helpers/helpers.cmake"
(("\\(\"\\$\\{found_basepath\\}\" GREATER \"0\"\\)") (("\\(\"\\$\\{found_basepath\\}\" GREATER \"0\"\\)")
"true")) "true"))
;; Add include directories for qt modules. ;; Add include directories for qt modules.
(let ((dirs (map (lambda (name) (let ((dirs (map (lambda (name)
(string-append (assoc-ref inputs name) (string-append (assoc-ref inputs name)
"/include/qt5")) "/include/qt5"))
'("qtdatavis3d" '("qtdatavis3d"
"qtdeclarative" "qtdeclarative"
"qtlocation" "qtlocation"
"qtmultimedia" "qtmultimedia"
"qtquickcontrols" "qtquickcontrols"
"qtquickcontrols2" "qtquickcontrols2"
"qtscript" "qtscript"
"qtscxml" "qtscxml"
"qtsensors" "qtsensors"
"qtspeech" "qtspeech"
"qtsvg" "qtsvg"
"qttools-5" "qttools"
"qtwebchannel" "qtwebchannel"
"qtwebengine" "qtwebengine"
"qtwebsockets" "qtwebsockets"
"qtx11extras" "qtx11extras"
"qtxmlpatterns")))) "qtxmlpatterns"))))
(substitute* "cmake/Macros/PySideModules.cmake" (substitute* "cmake/Macros/PySideModules.cmake"
(("\\$\\{PATH_SEP\\}\\$\\{core_includes\\}" all) (("\\$\\{PATH_SEP\\}\\$\\{core_includes\\}" all)
(fold (lambda (dir paths) (fold (lambda (dir paths)
(string-append paths "${PATH_SEP}" dir)) (string-append paths "${PATH_SEP}" dir))
all all
dirs))) dirs)))
(setenv "CXXFLAGS" (fold (lambda (dir paths) (setenv "CXXFLAGS" (fold (lambda (dir paths)
(string-append paths " -I" dir)) (string-append paths " -I" dir))
"" ""
dirs))))) dirs)))))
(add-before 'configure 'set-clang-dir (add-before 'configure 'set-clang-dir
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((clang (assoc-ref inputs "clang-toolchain"))) (let ((clang (assoc-ref inputs "clang-toolchain")))
(setenv "CLANG_INSTALL_DIR" clang) (setenv "CLANG_INSTALL_DIR" clang)
#t)))))) #t))))))
(home-page "https://wiki.qt.io/Qt_for_Python") (home-page "https://wiki.qt.io/Qt_for_Python")
(synopsis (synopsis
"The Qt for Python product enables the use of Qt5 APIs in Python applications") "The Qt for Python product enables the use of Qt5 APIs in Python applications")