nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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'.
This commit is contained in:
Mark H Weaver 2015-02-21 08:25:38 -05:00
parent a34816ef6e
commit 94c4300720
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/packages/admin.scm
View File

@ -420,6 +420,7 @@ connection alive.")
(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"))
(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"
@ -431,17 +432,19 @@ connection alive.")
(copy-file "client/scripts/linux" (copy-file "client/scripts/linux"
(string-append libexec "/dhclient-script")) (string-append libexec "/dhclient-script"))
(wrap-program (string-append libexec "/dhclient-script") (wrap-program
`("PATH" ":" prefix (string-append libexec "/dhclient-script")
,(map (lambda (dir) `("PATH" ":" prefix
(string-append dir "/bin:" ,(map (lambda (dir)
dir "/sbin")) (string-append dir "/bin:"
(list net-tools coreutils sed)))))) dir "/sbin"))
(list inetutils net-tools coreutils sed))))))
%standard-phases)))) %standard-phases))))
(native-inputs `(("perl" ,perl))) (native-inputs `(("perl" ,perl)))
(inputs `(("net-tools" ,net-tools) (inputs `(("inetutils" ,inetutils)
("net-tools" ,net-tools)
("iproute" ,iproute) ("iproute" ,iproute)
;; When cross-compiling, we need the cross Coreutils and sed. ;; When cross-compiling, we need the cross Coreutils and sed.