02/02: gnu: guix: Ignore the user's 'GUILE_LOAD_COMPILED_PATH'.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 61cdad351dc537cfd76a1e03abc1a30031a178a8
Author: Ludovic Courtès <address@hidden>
Date:   Tue Mar 29 22:11:59 2016 +0200

    gnu: guix: Ignore the user's 'GUILE_LOAD_COMPILED_PATH'.
    
    Reported by <address@hidden>.
    
    * gnu/packages/package-management.scm (guix-0.10.0)[arguments]: Use '=
    instead of 'prefix in call to 'wrap-program'.
---
 gnu/packages/package-management.scm |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index 9ba7780..38c9bdb 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -140,9 +140,16 @@
                             (path   (string-append
                                      json "/share/guile/site/2.0:"
                                      gnutls "/share/guile/site/2.0")))
+
+                       ;; Ignore user settings so that a bogus
+                       ;; GUILE_LOAD_COMPILED_PATH does not prevent use of
+                       ;; 'guix', notably when it contains entries pointing to
+                       ;; incompatible .go files as reported at
+                       ;; 
<https://lists.gnu.org/archive/html/guix-devel/2016-03/msg01261.html>.
                        (wrap-program (string-append out "/bin/guix")
-                         `("GUILE_LOAD_PATH" ":" prefix (,path))
-                         `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,path)))
+                         `("GUILE_LOAD_PATH" ":" = (,path))
+                         `("GUILE_LOAD_COMPILED_PATH" ":" = (,path)))
+
                        #t))))))
     (native-inputs `(("pkg-config" ,pkg-config)
                      ("emacs" ,emacs-no-x)))      ;for guix.el