[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: gnu: Fix python-shiboken-2.
From: |
guix-commits |
Subject: |
01/03: gnu: Fix python-shiboken-2. |
Date: |
Thu, 19 Dec 2019 03:37:55 -0500 (EST) |
efraim pushed a commit to branch master
in repository guix.
commit 162cc7f8a499849ccdaedadfa406e1819b0478a6
Author: John Soo <address@hidden>
Date: Wed Dec 18 06:21:00 2019 -0800
gnu: Fix python-shiboken-2.
* gnu/packages/qt.scm (python-shiboken-2)[inputs]: Remove llvm-6,
clang-6. Add clang-toolchain-6.
[arguments]: Adjust for change in inputs.
Signed-off-by: Efraim Flashner <address@hidden>
---
gnu/packages/qt.scm | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index c0d652a..747d543 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2107,8 +2107,7 @@ color-related widgets.")
"0g8jacm2iqd7lw2m7f1dp1nnrsk38bl3m8pihm8zz9gxs8d31sf5"))))
(build-system cmake-build-system)
(inputs
- `(("llvm-6" ,llvm-6)
- ("clang-6" ,clang-6)
+ `(("clang-toolchain" ,clang-toolchain-6)
("libxml2" ,libxml2)
("libxslt" ,libxslt)
("python-wrapper" ,python-wrapper)
@@ -2124,7 +2123,7 @@ color-related widgets.")
(lambda _ (chdir "sources/shiboken2") #t))
(add-before 'configure 'set-build-env
(lambda* (#:key inputs #:allow-other-keys)
- (let ((llvm (assoc-ref inputs "llvm-6")))
+ (let ((llvm (assoc-ref inputs "clang-toolchain")))
(setenv "CLANG_INSTALL_DIR" llvm)
#t))))))
(home-page "https://wiki.qt.io/Qt_for_Python")