me
/
guix
Archived
1
0
Fork 0
Code

gnu: isc-dhcp: Do not refer to canonical coreutils. 

Make sure not to retain a reference to the canonical coreutils and sed
packages.  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 (isc-dhcp)[inputs]: Add "coreutils" and "sed",
[arguments]: and use them, instead of their canonical counterpart.
master
Mathieu Othacehe 2020-08-27 15:38:45 +02:00
parent ad476912b6
commit 17f168fcad
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/admin.scm
View File

@ -1042,10 +1042,10 @@ connection alive.")
;; if finds all the programs it needs. ;; if finds all the programs it needs.
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(libexec (string-append out "/libexec")) (libexec (string-append out "/libexec"))
(coreutils (assoc-ref inputs "coreutils")) (coreutils (assoc-ref inputs "coreutils*"))
(inetutils (assoc-ref inputs "inetutils")) (inetutils (assoc-ref inputs "inetutils"))
(net-tools (assoc-ref inputs "net-tools")) (net-tools (assoc-ref inputs "net-tools"))
(sed (assoc-ref inputs "sed"))) (sed (assoc-ref inputs "sed*")))
(substitute* "client/scripts/linux" (substitute* "client/scripts/linux"
(("/sbin/ip") (("/sbin/ip")
(string-append (assoc-ref inputs "iproute") (string-append (assoc-ref inputs "iproute")
@ -1085,12 +1085,8 @@ connection alive.")
(base32 (base32
"1j9a4r83a77mp8k1y8z524c9rzdqgd8rzwczd6zwmw86a00xiimg")))) "1j9a4r83a77mp8k1y8z524c9rzdqgd8rzwczd6zwmw86a00xiimg"))))
;; When cross-compiling, we need the cross Coreutils and sed. ("coreutils*" ,coreutils)
;; Otherwise just use those from %FINAL-INPUTS. ("sed*" ,sed)))
,@(if (%current-target-system)
`(("coreutils" ,coreutils)
("sed" ,sed))
'())))
(home-page "https://www.isc.org/products/DHCP/") (home-page "https://www.isc.org/products/DHCP/")
(synopsis "Dynamic Host Configuration Protocol (DHCP) tools") (synopsis "Dynamic Host Configuration Protocol (DHCP) tools")