From 84775d65a8aedcb8308c74d4ac7223f02d8fdd3e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 20 Mar 2018 06:14:28 +0100 Subject: gnu: leocad: Update phase style. * gnu/packages/lego.scm (leocad)[arguments]: Substitute INVOKE for SYSTEM* and end all phases with an explicit #t. --- gnu/packages/lego.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lego.scm b/gnu/packages/lego.scm index 84e740fa17..80df42bb69 100644 --- a/gnu/packages/lego.scm +++ b/gnu/packages/lego.scm @@ -84,7 +84,7 @@ (define-public leocad "189wj221fn08bnsfwy8050bxkjgjwinkn19qdcvb6c2ry2lnfra9")))) (build-system gnu-build-system) (native-inputs - `(("qttools" ,qttools))) ;for lrelease + `(("qttools" ,qttools))) ; for lrelease (inputs `(("mesa" ,mesa) ("qtbase" ,qtbase) @@ -96,12 +96,13 @@ (define-public leocad (replace 'configure (lambda* (#:key outputs inputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (zero? (system* "qmake" - (string-append "INSTALL_PREFIX=" out) - ;; Otherwise looks for lrelease-qt4 - "QMAKE_LRELEASE=lrelease" - ;; Don't pester users about updates - "DISABLE_UPDATE_CHECK=1"))))) + (invoke "qmake" + (string-append "INSTALL_PREFIX=" out) + ;; Otherwise looks for lrelease-qt4. + "QMAKE_LRELEASE=lrelease" + ;; Don't pester users about updates. + "DISABLE_UPDATE_CHECK=1") + #t))) (add-after 'configure 'reset-resource-timestamps (lambda _ ;; The contents of build/release/.qrc/qrc_leocad.cpp generated by @@ -114,7 +115,8 @@ (define-public leocad (src (string-append base ".ts")) (st (stat src))) (set-file-time file st))) - (find-files "." "leocad_.*\\.qm")))))))) + (find-files "." "leocad_.*\\.qm"))) + #t))))) (home-page "http://www.leocad.org") (synopsis "Create virtual Lego models") (description -- cgit v1.2.3