diff options
Diffstat (limited to 'gnu/packages/admin.scm')
| -rw-r--r-- | gnu/packages/admin.scm | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index b10fc6fe39..dc6a83b9e5 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -205,16 +205,7 @@ client and server, a telnet client and server, and an rsh client and server.") (delete-file (string-append bin "/groups")) (for-each delete-file (find-files man "^groups\\.")) #t)) - (alist-cons-after - 'unpack 'reset-timestamps - (lambda _ - ;; FIXME: Reset the file timestamps here, until the - ;; 'unpack' phase does it for us. See - ;; <https://lists.gnu.org/archive/html/guix-devel/2014-04/msg00098.html>. - (for-each (lambda (file) - (utime file 0 0 0)) - (find-files "." ""))) - %standard-phases))))) + %standard-phases)))) (inputs (if (string-suffix? "-linux" (or (%current-target-system) @@ -446,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") |