[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: isc-dhcp: Add inetutils to inputs.
From: |
Mark H. Weaver |
Subject: |
01/01: gnu: isc-dhcp: Add inetutils to inputs. |
Date: |
Sat, 21 Feb 2015 13:32:05 +0000 |
mhw pushed a commit to branch master
in repository guix.
commit 94c43007200ba97879004db546dfc6bd8473da0d
Author: Mark H Weaver <address@hidden>
Date: Sat Feb 21 08:25:38 2015 -0500
gnu: isc-dhcp: Add inetutils to inputs.
* gnu/packages/admin.scm (isc-dhcp): Add inetutils to inputs, and
add it to the PATH set by the wrapper around 'dhclient-script'.
---
gnu/packages/admin.scm | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 63c16f0..c779ade 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -420,6 +420,7 @@ connection alive.")
(let* ((out (assoc-ref outputs "out"))
(libexec (string-append out "/libexec"))
(coreutils (assoc-ref inputs "coreutils"))
+ (inetutils (assoc-ref inputs "inetutils"))
(net-tools (assoc-ref inputs "net-tools"))
(sed (assoc-ref inputs "sed")))
(substitute* "client/scripts/linux"
@@ -431,17 +432,19 @@ connection alive.")
(copy-file "client/scripts/linux"
(string-append libexec "/dhclient-script"))
- (wrap-program (string-append libexec "/dhclient-script")
- `("PATH" ":" prefix
- ,(map (lambda (dir)
- (string-append dir "/bin:"
- dir "/sbin"))
- (list net-tools coreutils sed))))))
+ (wrap-program
+ (string-append libexec "/dhclient-script")
+ `("PATH" ":" prefix
+ ,(map (lambda (dir)
+ (string-append dir "/bin:"
+ dir "/sbin"))
+ (list inetutils net-tools coreutils sed))))))
%standard-phases))))
(native-inputs `(("perl" ,perl)))
- (inputs `(("net-tools" ,net-tools)
+ (inputs `(("inetutils" ,inetutils)
+ ("net-tools" ,net-tools)
("iproute" ,iproute)
;; When cross-compiling, we need the cross Coreutils and sed.