From aa73cd5d8e5e48d24460c9d6bcebfc92b3311d4c Mon Sep 17 00:00:00 2001
From: Nikita Karetnikov <address@hidden>
Date: Sun, 28 Apr 2013 16:08:23 +0000
Subject: [PATCH] utils: Adjust 'wrap-program'.

* guix/build/utils.scm (wrap-program): Assume that 'prog' is an
  absolute filename.  Adjust 'prog-real' and 'prog-tmp' accordingly.
  Also, change 'prog-tmp' to honor command line arguments.
---
 guix/build/utils.scm |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/guix/build/utils.scm b/guix/build/utils.scm
index 356dd46..fe6978b 100644
--- a/guix/build/utils.scm
+++ b/guix/build/utils.scm
@@ -680,8 +680,8 @@ contents:
 This is useful for scripts that expect particular programs to be in $PATH, for
 programs that expect particular shared libraries to be in $LD_LIBRARY_PATH, or
 modules in $GUILE_LOAD_PATH, etc."
-  (let ((prog-real (string-append "." prog "-real"))
-        (prog-tmp  (string-append "." prog "-tmp")))
+  (let ((prog-real (string-append (dirname prog) "/." (basename prog) "-real"))
+        (prog-tmp  (string-append (dirname prog) "/." (basename prog) "-tmp")))
     (define (export-variable lst)
       ;; Return a string that exports an environment variable.
       (match lst
@@ -709,11 +709,11 @@ modules in $GUILE_LOAD_PATH, etc."
     (with-output-to-file prog-tmp
       (lambda ()
         (format #t
-                "#!~a~%~a~%exec ~a~%"
+                "#!~a~%~a~%exec ~a address@hidden"
                 (which "bash")
                 (string-join (map export-variable vars)
                              "\n")
-                (canonicalize-path prog-real))))
+                prog-real)))
 
     (chmod prog-tmp #o755)
     (rename-file prog-tmp prog)))
-- 
1.7.5.4