summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2022-12-09 16:43:25 +0100
committerLudovic Courtès <ludo@gnu.org>2022-12-09 16:43:25 +0100
commit556520a33c8a62fc80ac9ab925f86f08986d138b (patch)
treee7f9656011ba5fc60a592e23da045663b6c1d4a4
parent755c4b496e24f2df5f1b0f4a3873e9e00bae1fdc (diff)
services: nscd: Use nscd from 'glibc-final' on native builds.
This reduces the closure size of systems by removing one glibc copy--namely (@ (gnu packages base) glibc) in addition to (@ (gnu packages commencement) glibc-final). * gnu/services/base.scm (<nscd-configuration>)[glibc]: Change default value to use 'let-system' and 'canonical-package' as appropriate.
-rw-r--r--gnu/services/base.scm11
1 files changed, 9 insertions, 2 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 370696a55e1..2b1974d77e1 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -61,7 +61,8 @@
61 util-linux xfsprogs)) 61 util-linux xfsprogs))
62 #:use-module (gnu packages bash) 62 #:use-module (gnu packages bash)
63 #:use-module ((gnu packages base) 63 #:use-module ((gnu packages base)
64 #:select (coreutils glibc glibc-utf8-locales tar)) 64 #:select (coreutils glibc glibc-utf8-locales tar
65 canonical-package))
65 #:use-module ((gnu packages compression) #:select (gzip)) 66 #:use-module ((gnu packages compression) #:select (gzip))
66 #:autoload (gnu packages guile-xyz) (guile-netlink) 67 #:autoload (gnu packages guile-xyz) (guile-netlink)
67 #:autoload (gnu packages hurd) (hurd) 68 #:autoload (gnu packages hurd) (hurd)
@@ -1211,7 +1212,13 @@ the tty to run, among other things."
1211 (name-services nscd-configuration-name-services ;list of file-like 1212 (name-services nscd-configuration-name-services ;list of file-like
1212 (default '())) 1213 (default '()))
1213 (glibc nscd-configuration-glibc ;file-like 1214 (glibc nscd-configuration-glibc ;file-like
1214 (default glibc))) 1215 (default (let-system (system target)
1216 ;; Unless we're cross-compiling, arrange to use nscd
1217 ;; from 'glibc-final' instead of pulling in a second
1218 ;; glibc copy.
1219 (if target
1220 glibc
1221 (canonical-package glibc))))))
1215 1222
1216(define-record-type* <nscd-cache> nscd-cache make-nscd-cache 1223(define-record-type* <nscd-cache> nscd-cache make-nscd-cache
1217 nscd-cache? 1224 nscd-cache?