From dc34393569aa4e5db4e4da8d8be8e827d2e94ab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 18 Jun 2014 23:07:14 +0200 Subject: [PATCH] gnu: isc-dhcp: In native builds, refer to the final Coreutils and sed. * gnu/packages/admin.scm (isc-dhcp)[inputs]: Add Coreutils and sed only when (%current-target-system) is true. --- gnu/packages/admin.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index a3d600d7be..dc6a83b9e5 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -437,11 +437,15 @@ connection alive.") (native-inputs `(("perl" ,perl))) - ;; Even Coreutils and sed are needed here in case we're cross-compiling. - (inputs `(("coreutils" ,coreutils) - ("sed" ,sed) - ("net-tools" ,net-tools) - ("iproute" ,iproute))) + (inputs `(("net-tools" ,net-tools) + ("iproute" ,iproute) + + ;; When cross-compiling, we need the cross Coreutils and sed. + ;; Otherwise just use those from %FINAL-INPUTS. + ,@(if (%current-target-system) + `(("coreutils" ,coreutils) + ("sed" ,sed)) + '()))) (home-page "http://www.isc.org/products/DHCP/") (synopsis "Dynamic Host Configuration Protocol (DHCP) tools")