From 61cdad351dc537cfd76a1e03abc1a30031a178a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 29 Mar 2016 22:11:59 +0200
Subject: [PATCH] gnu: guix: Ignore the user's 'GUILE_LOAD_COMPILED_PATH'.
Reported by <rain1@openmailbox.org>.
* 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 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 9ba7780239e..38c9bdb7d12 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -140,9 +140,16 @@ (define (copy arch)
(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
--
GitLab