02/03: services: nscd: Use nscd from 'glibc-final' on native builds.

[guix-commits]

civodul pushed a commit to branch version-1.4.0
in repository guix.

commit 556520a33c8a62fc80ac9ab925f86f08986d138b
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Dec 9 16:43:25 2022 +0100

    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.
---
 gnu/services/base.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 370696a55e..2b1974d77e 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?