From fc484f605cf3fc1be1206bb3d6637d0ca264ddea Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 19 Aug 2012 23:05:04 +0200 Subject: build-system/gnu: Augment $PATH with $out for `patch-shebangs'. * guix/build/gnu-build-system.scm (patch-shebangs): Add BINDIRS to $PATH, and pass that to `patch-shebang'. --- guix/build/gnu-build-system.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index 0a865fca23..72f9536ae8 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -134,11 +134,13 @@ (string-append dir "/sbin")))) outputs)) - (for-each (lambda (dir) - (let ((files (list-of-files dir))) - (for-each patch-shebang files))) - bindirs) - #t) + (let ((path (append bindirs + (search-path-as-string->list (getenv "PATH"))))) + (for-each (lambda (dir) + (let ((files (list-of-files dir))) + (for-each (cut patch-shebang <> path) files))) + bindirs) + #t)) (define %standard-phases ;; Standard build phases, as a list of symbol/procedure pairs. -- cgit v1.2.3