diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2019-01-25 15:20:25 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2019-01-25 15:20:25 +0100 |
| commit | 02d38bd3a2c964698ef08524d6313b726ce63846 (patch) | |
| tree | 94a0e57b2e017ba80a9f7309aae241862ea2e81f /gnu/packages/qt.scm | |
| parent | 2b965485e2f3a8755efff58fc1abad75df3e37a0 (diff) | |
| parent | 776248419fe521afe9c6dd4b2fac6fc4b8b18e9b (diff) | |
| download | guix-02d38bd3a2c964698ef08524d6313b726ce63846.tar guix-02d38bd3a2c964698ef08524d6313b726ce63846.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/qt.scm')
| -rw-r--r-- | gnu/packages/qt.scm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8c376bf259..9c61d3c9ef 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1907,11 +1907,11 @@ contain over 620 classes.") (lib (string-append out "/lib/python" python-major+minor "/site-packages"))) - (zero? (system* "python" "configure.py" - "--confirm-license" - "--bindir" bin - "--destdir" lib - "--sipdir" sip)))))))) + (invoke "python" "configure.py" + "--confirm-license" + "--bindir" bin + "--destdir" lib + "--sipdir" sip))))))) (license (list license:gpl2 license:gpl3)))) ; choice of either license (define-public qscintilla @@ -2103,7 +2103,7 @@ securely. It will not store any data unencrypted unless explicitly requested.") (substitute* '("doc/doc.pro") ;; We'll install them in the 'install-man-pages' phase. (("^unix:doc\\.files.*") "")) - (zero? (system* "qmake"))))) + (invoke "qmake")))) (add-after 'install 'install-man-pages (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) |