~ruther/guix-local

61cdad351dc537cfd76a1e03abc1a30031a178a8 — Ludovic Courtès 10 years ago 3a9a4c5
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'.
1 files changed, 9 insertions(+), 2 deletions(-)

M gnu/packages/package-management.scm
M gnu/packages/package-management.scm => gnu/packages/package-management.scm +9 -2
@@ 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