From 2aa137e261984b9762de5221459835eefb165fe7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 13:29:38 +0200 Subject: gnu: crossguid: Use INVOKE. * gnu/packages/kodi.scm (crossguid)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/kodi.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'gnu/packages/kodi.scm') diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 62a971a0a8..2df5735dd0 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 David Thompson ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017 Oleg Pykhalov +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -92,22 +93,22 @@ (arguments '(#:phases (modify-phases %standard-phases - (delete 'configure) ; no configure script + (delete 'configure) ; no configure script ;; There's no build system here, so we have to do it ourselves. (replace 'build (lambda _ - (and (zero? (system* "g++" "-c" "guid.cpp" "-o" "guid.o" - "-std=c++11" "-DGUID_LIBUUID")) - (zero? (system* "ar" "rvs" "libcrossguid.a" "guid.o"))))) + (invoke "g++" "-c" "guid.cpp" "-o" "guid.o" + "-std=c++11" "-DGUID_LIBUUID") + (invoke "ar" "rvs" "libcrossguid.a" "guid.o"))) (replace 'check (lambda _ - (and (zero? (system* "g++" "-c" "test.cpp" "-o" "test.o" - "-std=c++11")) - (zero? (system* "g++" "-c" "testmain.cpp" "-o" "testmain.o" - "-std=c++11")) - (zero? (system* "g++" "test.o" "guid.o" "testmain.o" - "-o" "test" "-luuid")) - (zero? (system* (string-append (getcwd) "/test")))))) + (invoke "g++" "-c" "test.cpp" "-o" "test.o" + "-std=c++11") + (invoke "g++" "-c" "testmain.cpp" "-o" "testmain.o" + "-std=c++11") + (invoke "g++" "test.o" "guid.o" "testmain.o" + "-o" "test" "-luuid") + (invoke (string-append (getcwd) "/test")))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) -- cgit 1.4.1 From 93ab9a5d76b8b84afd6823e2cdd1f62c9e6284f2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 13:29:54 +0200 Subject: gnu: kodi: Use INVOKE. * gnu/packages/kodi.scm (kodi)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/kodi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/kodi.scm') diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 2df5735dd0..86ce914d53 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -295,7 +295,7 @@ generator library for C++.") "lib/cpluff"))) (every (lambda (third-party) (with-directory-excursion third-party - (zero? (system* "autoreconf" "-vif")))) + (invoke "autoreconf" "-vif"))) dirs)))) (add-after 'bootstrap-bundled-software 'patch-stuff (lambda* (#:key inputs #:allow-other-keys) @@ -336,7 +336,7 @@ generator library for C++.") #t)) (add-before 'check 'build-kodi-test (lambda _ - (zero? (system* "make" "kodi-test"))))))) + (invoke "make" "kodi-test")))))) ;; TODO: Add dependencies for: ;; - nfs ;; - cec -- cgit 1.4.1