guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch core-updates updated: gnu: inetutils: Do not refer to canonical c


From: guix-commits
Subject: branch core-updates updated: gnu: inetutils: Do not refer to canonical coreutils.
Date: Thu, 27 Aug 2020 10:34:58 -0400

This is an automated email from the git hooks/post-receive script.

mothacehe pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new 15e7167  gnu: inetutils: Do not refer to canonical coreutils.
15e7167 is described below

commit 15e716740564485f2e14cadca1cd50c2aa450fe7
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Thu Aug 27 16:18:31 2020 +0200

    gnu: inetutils: Do not refer to canonical coreutils.
    
    Make sure not to retain a reference to the canonical coreutils package.  The
    Guix System closure size would otherwise be increased by including 
references
    to both canonical and non-canonical version of those packages.
    
    * gnu/packages/admin.scm (inetutils)[inputs]: Add "coreutils",
    [arguments]: and point to it with PATHDEF_CP variable.
---
 gnu/packages/admin.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 61a98cc..1641bdf 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -623,10 +623,16 @@ re-executing them as necessary.")
                                    "--disable-uucpd"
                                    "--disable-whois")
                                  '()))
+       ;; Make sure that canonical "coreutils" package is not referred.
+       #:make-flags
+       (list (string-append "CPPFLAGS=-DPATHDEF_CP=\\\""
+                            (assoc-ref %build-inputs "coreutils*")
+                            "/bin/cp\\\""))
        ;; On some systems, 'libls.sh' may fail with an error such as:
        ;; "Failed to tell switch -a apart from -A".
        #:parallel-tests? #f))
-    (inputs `(("ncurses" ,ncurses)
+    (inputs `(("coreutils*" ,coreutils)
+              ("ncurses" ,ncurses)
               ("readline" ,readline)))        ;for 'ftp'
     (native-inputs (if (member (%current-system)
                                (package-supported-systems net-tools))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]