aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/qt.scm
diff options
context:
space:
mode:
authorJohn Soo <jsoo1@asu.edu>2019-12-18 06:21:56 -0800
committerEfraim Flashner <efraim@flashner.co.il>2019-12-19 10:36:43 +0200
commit43001931a2062810766cb8627a04149ed28ff8a2 (patch)
tree184f3a25d9f8d84544857fb6ee54468933333165 /gnu/packages/qt.scm
parent162cc7f8a499849ccdaedadfa406e1819b0478a6 (diff)
downloadguix-43001931a2062810766cb8627a04149ed28ff8a2.tar
guix-43001931a2062810766cb8627a04149ed28ff8a2.tar.gz
gnu: Fix python-pyside-2.
* 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>
Diffstat (limited to 'gnu/packages/qt.scm')
-rw-r--r--gnu/packages/qt.scm8
1 files changed, 3 insertions, 5 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 747d5437e2..795b5e9d2b 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2161,8 +2161,7 @@ color-related widgets.")
`(("libcxx" ,libcxx-6)
("libxml2" ,libxml2)
("libxslt" ,libxslt)
- ("llvm-6" ,llvm-6)
- ("clang-6" ,clang-6)
+ ("clang-toolchain" ,clang-toolchain-6)
("qtbase" ,qtbase)
("qtdatavis3d" ,qtdatavis3d)
("qtlocation" ,qtlocation)
@@ -2188,13 +2187,12 @@ color-related widgets.")
;; FIXME: Building tests fail.
#:configure-flags '("-DBUILD_TESTS=FALSE")
#:phases
- (modify-phases
- %standard-phases
+ (modify-phases %standard-phases
(add-after 'unpack 'go-to-source-dir
(lambda _ (chdir "sources/pyside2") #t))
(add-before 'configure 'set-clang-dir
(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")))
(setenv "CLANG_INSTALL_DIR" clang)
(substitute* "cmake/Macros/PySideModules.cmake"