From 61560d4bef05711db86320794437e1b261f4b5aa Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 27 Aug 2020 16:18:31 +0200 Subject: 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(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 5efe67b0cb..a1b9761633 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)) -- cgit v1.2.3