gnu: netpbm: Use INVOKE.

* gnu/packages/netpbm.scm (netpbm)[arguments]: Substitute INVOKE
for SYSTEM*.
This commit is contained in:
Tobias Geerinckx-Rice 2020-04-01 18:56:19 +02:00
parent 3853941d25
commit 079ffbcfaf
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79

View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -145,7 +145,7 @@ (define-syntax drop
(add-before 'check 'setup-check (add-before 'check 'setup-check
(lambda _ (lambda _
;; install temporarily into /tmp/netpbm ;; install temporarily into /tmp/netpbm
(system* "make" "package") (invoke "make" "package")
;; remove test requiring X ;; remove test requiring X
(substitute* "test/all-in-place.test" (("pamx") "")) (substitute* "test/all-in-place.test" (("pamx") ""))
;; do not worry about non-existing file ;; do not worry about non-existing file
@ -168,11 +168,11 @@ (define-syntax drop
(replace 'install (replace 'install
(lambda* (#:key outputs make-flags #:allow-other-keys) (lambda* (#:key outputs make-flags #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(apply system* "make" "package" (apply invoke "make" "package"
(string-append "pkgdir=" out) make-flags) (string-append "pkgdir=" out) make-flags)
;; Remove superfluous files. ;; Remove superfluous files.
(system* "rm" "-r" (string-append out "/link")) (invoke "rm" "-r" (string-append out "/link"))
(system* "rm" "-r" (string-append out "/misc")) (invoke "rm" "-r" (string-append out "/misc"))
(with-directory-excursion out (with-directory-excursion out
(for-each delete-file (for-each delete-file
'("config_template" "pkginfo" "README" '("config_template" "pkginfo" "README"