me/guix
Archived
1
0
Fork 0
Code Activity

gnu: Fix python-pyside-2.

Browse source 
* gnu/packages/qt.scm (python-pyside-2)[inputs]: Remove llvm-6, clang-6.
Add clang-toolchain-6.
[arguments]: Adjust for change in inputs.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
This commit is contained in:
John Soo 2019-12-18 06:21:56 -08:00 • committed by Efraim Flashner
parent 162cc7f8a4
commit 43001931a2
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/qt.scm
View file

@ -2161,8 +2161,7 @@ color-related widgets.")
`(("libcxx" ,libcxx-6) `(("libcxx" ,libcxx-6)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("libxslt" ,libxslt) ("libxslt" ,libxslt)
("llvm-6" ,llvm-6) ("clang-toolchain" ,clang-toolchain-6)
("clang-6" ,clang-6)
("qtbase" ,qtbase) ("qtbase" ,qtbase)
("qtdatavis3d" ,qtdatavis3d) ("qtdatavis3d" ,qtdatavis3d)
("qtlocation" ,qtlocation) ("qtlocation" ,qtlocation)
@ -2188,13 +2187,12 @@ color-related widgets.")
;; FIXME: Building tests fail. ;; FIXME: Building tests fail.
#:configure-flags '("-DBUILD_TESTS=FALSE") #:configure-flags '("-DBUILD_TESTS=FALSE")
#:phases #:phases
(modify-phases (modify-phases %standard-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-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-6")) (let ((clang (assoc-ref inputs "clang-toolchain"))
(libcxx (assoc-ref inputs "libcxx"))) (libcxx (assoc-ref inputs "libcxx")))
(setenv "CLANG_INSTALL_DIR" clang) (setenv "CLANG_INSTALL_DIR" clang)
(substitute* "cmake/Macros/PySideModules.cmake" (substitute* "cmake/Macros/PySideModules.cmake"