diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-12-12 15:03:35 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-12-12 15:03:35 +0100 |
| commit | 302a84a593e4be417d739caf4e5385df536e3943 (patch) | |
| tree | 3e9e908e52e3d4a141552d8fda9a7fbe2d41637c /gnu/services/base.scm | |
| parent | 3677b97030e5954fa26bdb435e0d3379a1a4ec43 (diff) | |
| parent | 6dbdb5fcf5640c126ac65479b835aba83aea2a6d (diff) | |
| download | guix-302a84a593e4be417d739caf4e5385df536e3943.tar.gz | |
Merge branch 'version-1.4.0'
Diffstat (limited to 'gnu/services/base.scm')
| -rw-r--r-- | gnu/services/base.scm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm index ba59e46155..4908af8edd 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -61,7 +61,8 @@ util-linux xfsprogs)) #:use-module (gnu packages bash) #:use-module ((gnu packages base) - #:select (coreutils glibc glibc-utf8-locales tar)) + #:select (coreutils glibc glibc-utf8-locales tar + canonical-package)) #:use-module ((gnu packages compression) #:select (gzip)) #:autoload (gnu packages guile-xyz) (guile-netlink) #:autoload (gnu packages hurd) (hurd) @@ -1211,7 +1212,13 @@ the tty to run, among other things." (name-services nscd-configuration-name-services ;list of file-like (default '())) (glibc nscd-configuration-glibc ;file-like - (default glibc))) + (default (let-system (system target) + ;; Unless we're cross-compiling, arrange to use nscd + ;; from 'glibc-final' instead of pulling in a second + ;; glibc copy. + (if target + glibc + (canonical-package glibc)))))) (define-record-type* <nscd-cache> nscd-cache make-nscd-cache nscd-cache? |