nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: p7zip: Use invoke. 

* gnu/packages/compression.scm (p7zip)[arguments]: Use invoke and remove
vestigial plumbing.
This commit is contained in:
Mark H Weaver 2018-03-16 02:36:06 -04:00
parent 831016bd22
commit 8fcdd9d53f
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gnu/packages/compression.scm
View File

@ -1420,22 +1420,22 @@ It can be used as a replacement for the Apache @code{CBZip2InputStream} /
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
(lambda* (#:key system outputs #:allow-other-keys) (lambda* (#:key system outputs #:allow-other-keys)
(zero? (system* "cp" (invoke "cp"
(let ((system ,(or (%current-target-system) (let ((system ,(or (%current-target-system)
(%current-system)))) (%current-system))))
(cond (cond
((string-prefix? "x86_64" system) ((string-prefix? "x86_64" system)
"makefile.linux_amd64_asm") "makefile.linux_amd64_asm")
((string-prefix? "i686" system) ((string-prefix? "i686" system)
"makefile.linux_x86_asm_gcc_4.X") "makefile.linux_x86_asm_gcc_4.X")
(else (else
"makefile.linux_any_cpu_gcc_4.X"))) "makefile.linux_any_cpu_gcc_4.X")))
"makefile.machine")))) "makefile.machine")))
(replace 'check (replace 'check
(lambda _ (lambda _
(and (zero? (system* "make" "test")) (invoke "make" "test")
(zero? (system* "make" "test_7z")) (invoke "make" "test_7z")
(zero? (system* "make" "test_7zr")))))))) (invoke "make" "test_7zr"))))))
(inputs (inputs
(let ((system (or (%current-target-system) (let ((system (or (%current-target-system)
(%current-system)))) (%current-system))))