diff options
| author | Marius Bakke <marius@gnu.org> | 2020-12-13 20:50:50 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-12-13 20:50:50 +0100 |
| commit | d13ed52da216ece35af8e4f4ae413eb05912794b (patch) | |
| tree | a4313f1c21fb309ffea89be715be640376935cfb /guix/self.scm | |
| parent | bdfdb9d79d83c806ea59a9bdd99b5a786d14999c (diff) | |
| parent | a7737f0ead2293536b9d0ba253de4673378a0ffa (diff) | |
Merge branch 'ungrafting' into staging
Diffstat (limited to 'guix/self.scm')
| -rw-r--r-- | guix/self.scm | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/guix/self.scm b/guix/self.scm index c0de14b79a..7cda6656c9 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -649,18 +649,26 @@ load path." (program-file "guix-command" #~(begin + ;; Remove the empty extension from the search path. + (set! %load-extensions '(".scm")) + (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. |