diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-12-07 15:18:20 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-12-11 19:06:53 +0100 |
| commit | 459f0d07a1b0f76802a8b7deec8488f5956bce86 (patch) | |
| tree | a88a9b77963deaf16dd2dbde27d1bff40f6b9f79 | |
| parent | fd247542215fbd10f28980f3d5255014b150e95a (diff) | |
| download | guix-459f0d07a1b0f76802a8b7deec8488f5956bce86.tar.gz | |
self: Move Guile early in the module search path.
Until now, Guile modules would first be searched for in MODULE-DIRECTORY, then in each $GUILE_LOAD_PATH entry, and finally in Guile itself. * guix/self.scm (guix-command): Make GUILE the second entry in the %LOAD-PATH and %LOAD-COMPILED-PATH.
| -rw-r--r-- | guix/self.scm | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/guix/self.scm b/guix/self.scm index c0de14b79a..ca67f653fa 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -650,17 +650,22 @@ load path." (program-file "guix-command" #~(begin (set! %load-path - (cons (string-append #$module-directory - "/share/guile/site/" - (effective-version)) - %load-path)) + (append (list (string-append #$module-directory + "/share/guile/site/" + (effective-version)) + (string-append #$guile "/share/guile/" + (effective-version))) + %load-path)) (set! %load-compiled-path - (cons (string-append #$module-directory - "/lib/guile/" - (effective-version) - "/site-ccache") - %load-compiled-path)) + (append (list (string-append #$module-directory + "/lib/guile/" + (effective-version) + "/site-ccache") + (string-append #$guile "/lib/guile/" + (effective-version) + "/ccache")) + %load-compiled-path)) ;; To maximize the chances that locales are set up right ;; out-of-the-box, bundle "common" UTF-8 locales. |