mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 07:26:13 -05:00
compile-as-derivation: Adjust %load-compiled-path.
* build-aux/compile-as-derivation.scm: Set not only %load-path but also %load-compiled-path. This can avoid problems where a stale .go is loaded.
This commit is contained in:
parent
87284c6b48
commit
20cbd4f5f4
1 changed files with 14 additions and 7 deletions
|
@ -20,13 +20,20 @@
|
||||||
|
|
||||||
(use-modules (srfi srfi-26))
|
(use-modules (srfi srfi-26))
|
||||||
|
|
||||||
;; Add ~/.config/guix/latest to the search path.
|
;; Add ~/.config/guix/current to the search path.
|
||||||
(add-to-load-path
|
(eval-when (expand load eval)
|
||||||
(and=> (or (getenv "XDG_CONFIG_HOME")
|
(and=> (or (getenv "XDG_CONFIG_HOME")
|
||||||
(and=> (getenv "HOME")
|
(and=> (getenv "HOME")
|
||||||
(cut string-append <> "/.config")))
|
(cut string-append <> "/.config/guix/current")))
|
||||||
(cute string-append <> "/guix/current/share/guile/site/"
|
(lambda (current)
|
||||||
(effective-version))))
|
(set! %load-path
|
||||||
|
(cons (string-append current "/share/guile/site/"
|
||||||
|
(effective-version))
|
||||||
|
%load-path))
|
||||||
|
(set! %load-compiled-path
|
||||||
|
(cons (string-append current "/lib/guile/" (effective-version)
|
||||||
|
"/site-ccache")
|
||||||
|
%load-compiled-path)))))
|
||||||
|
|
||||||
(use-modules (guix) (guix ui)
|
(use-modules (guix) (guix ui)
|
||||||
(guix git-download)
|
(guix git-download)
|
||||||
|
|
Loading…
Reference in a new issue