~ruther/guix-local

94c43007200ba97879004db546dfc6bd8473da0d — Mark H Weaver 11 years ago a34816e
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'.
1 files changed, 10 insertions(+), 7 deletions(-)

M gnu/packages/admin.scm
M gnu/packages/admin.scm => gnu/packages/admin.scm +10 -7
@@ 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.