aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Woodcroft <donttrustben@gmail.com>2016-07-12 13:56:08 +1000
committerBen Woodcroft <donttrustben@gmail.com>2016-08-08 22:07:49 +1000
commit47bc991f71d0314217d103798db99f55ce59cde5 (patch)
tree02275ff7353128ba6b27fe698fd05cd4ce651e8e
parent7d229e26020fd7cdf247c6c68145812818350ce6 (diff)
downloadguix-47bc991f71d0314217d103798db99f55ce59cde5.tar
guix-47bc991f71d0314217d103798db99f55ce59cde5.tar.gz
gnu: parallel: Use full paths for executables.
* gnu/packages/parallel.scm (parallel)[inputs]: Add procps. [arguments]: New field.
-rw-r--r--gnu/packages/parallel.scm27
1 files changed, 26 insertions, 1 deletions
diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm
index 12f0028a34..3bb078e031 100644
--- a/gnu/packages/parallel.scm
+++ b/gnu/packages/parallel.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2016 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -54,7 +55,31 @@
(base32
"08gm0i9vj2nz8qgqi98z00myypgb3dni0s5yf3l17fp8h78fp4g3"))))
(build-system gnu-build-system)
- (inputs `(("perl" ,perl)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-bin-sh
+ (lambda _
+ (for-each
+ (lambda (file)
+ (substitute* file
+ ;; Patch hard coded '/bin/sh' in the lin ending in:
+ ;; $Global::shell = $ENV{'PARALLEL_SHELL'} ||
+ ;; parent_shell($$) || $ENV{'SHELL'} || "/bin/sh";
+ (("/bin/sh\\\";\n$") (string-append (which "sh") "\";\n"))
+ ;; Patch call to 'ps' and 'perl' commands.
+ ((" ps ") (string-append " " (which "ps") " "))
+ ((" perl -") (string-append " " (which "perl") " -"))))
+ (list "src/parallel" "src/sem"))))
+ (add-after 'install 'post-install-test
+ (lambda* (#:key outputs #:allow-other-keys)
+ (zero? (system* (string-append
+ (assoc-ref outputs "out") "/bin/parallel")
+ "echo"
+ ":::" "1" "2" "3")))))))
+ (inputs
+ `(("perl" ,perl)
+ ("procps" ,procps)))
(home-page "http://www.gnu.org/software/parallel/")
(synopsis "Build and execute command lines in parallel")
(description