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.master
parent
fd24754221
commit
459f0d07a1
|
@ -650,17 +650,22 @@ load path."
|
||||||
(program-file "guix-command"
|
(program-file "guix-command"
|
||||||
#~(begin
|
#~(begin
|
||||||
(set! %load-path
|
(set! %load-path
|
||||||
(cons (string-append #$module-directory
|
(append (list (string-append #$module-directory
|
||||||
"/share/guile/site/"
|
"/share/guile/site/"
|
||||||
(effective-version))
|
(effective-version))
|
||||||
%load-path))
|
(string-append #$guile "/share/guile/"
|
||||||
|
(effective-version)))
|
||||||
|
%load-path))
|
||||||
|
|
||||||
(set! %load-compiled-path
|
(set! %load-compiled-path
|
||||||
(cons (string-append #$module-directory
|
(append (list (string-append #$module-directory
|
||||||
"/lib/guile/"
|
"/lib/guile/"
|
||||||
(effective-version)
|
(effective-version)
|
||||||
"/site-ccache")
|
"/site-ccache")
|
||||||
%load-compiled-path))
|
(string-append #$guile "/lib/guile/"
|
||||||
|
(effective-version)
|
||||||
|
"/ccache"))
|
||||||
|
%load-compiled-path))
|
||||||
|
|
||||||
;; To maximize the chances that locales are set up right
|
;; To maximize the chances that locales are set up right
|
||||||
;; out-of-the-box, bundle "common" UTF-8 locales.
|
;; out-of-the-box, bundle "common" UTF-8 locales.
|
||||||
|
|
Reference in New Issue