summary refs log tree commit diff
diff options
context:
space:
mode:
authorTaylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>2017-03-18 18:21:00 +0100
committerTaylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>2017-03-18 18:26:11 +0100
commit57d0bdf8c60e0f72ceb473e758416b617c75cf9c (patch)
treefa7e2c6748e0967c342fe2f1fcff3808e5b56c6e
parent7601b9f7cec434379fd45e47ba25e64c4ea69382 (diff)
downloadguix-57d0bdf8c60e0f72ceb473e758416b617c75cf9c.tar.gz
gnu: guix: Don't ignore user's GUILE_LOAD_COMPILED_PATH.
* gnu/packages/package-management.scm (guix-0.12.0): Guile skips invalid .go
  files since 2.0.12 so we don't need to override GUILE_LOAD_COMPILED_PATH to
  prevent problems anymore.
-rw-r--r--gnu/packages/package-management.scm7
1 files changed, 1 insertions, 6 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 685636e8ba..f675e22ad9 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -147,14 +147,9 @@
                                      ssh "/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" ":" = (,path)))
+                         `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,path)))
 
                        #t))))))
     (native-inputs `(("pkg-config" ,pkg-config)