diff --git a/gnu/installer.scm b/gnu/installer.scm index 6c11fa619828af59a88e14eed8c494b5b9a17ca7..50f5b1aa776eb6d34e305cf0e254f4efa5c72114 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm @@ -61,6 +61,14 @@ (define module-to-import? (('guix 'build _ ...) #t) (_ #f))) +(define not-config? + ;; Select (guix …) and (gnu …) modules, except (guix config). + (match-lambda + (('guix 'config) #f) + (('guix _ ...) #t) + (('gnu _ ...) #t) + (_ #f))) + (define* (build-compiled-file name locale-builder) "Return a file-like object that evalutes the gexp LOCALE-BUILDER and store its result in the scheme file NAME. The derivation will also build a compiled @@ -75,8 +83,10 @@ (define set-utf8-locale (define builder (with-extensions (list guile-json-3) - (with-imported-modules (source-module-closure - '((gnu installer locale))) + (with-imported-modules `(,@(source-module-closure + '((gnu installer locale)) + #:select? not-config?) + ((guix config) => ,(make-config.scm))) #~(begin (use-modules (gnu installer locale))