ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-13 14:40:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: isc-dhcp: Remove unnecessary shebang patching.

Browse source 
* gnu/packages/admin.scm (isc-dhcp)[arguments]<#:phases>{post-install}:
  Remove parts indicated by TODOs.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
This commit is contained in:
Maxime Devos 2021-10-01 16:21:12 +02:00 committed by Mathieu Othacehe
parent 283bc45649
commit 0fe0a3a8ee
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 1 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gnu/packages/admin.scm
View file

@ -1267,11 +1267,7 @@ (define-public isc-dhcp
"--owner=root:0" "--owner=root:0"
"--group=root:0"))))) "--group=root:0")))))
(add-after 'install 'post-install (add-after 'install 'post-install
;; TODO(core-updates): native-inputs isn't required anymore. (lambda* (#:key inputs outputs #:allow-other-keys)
(lambda* (#:key ,@(if (%current-target-system)
'(native-inputs)
'())
inputs outputs #:allow-other-keys)
;; Install the dhclient script for GNU/Linux and make sure ;; Install the dhclient script for GNU/Linux and make sure
;; if finds all the programs it needs. ;; if finds all the programs it needs.
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -1295,19 +1291,6 @@ (define-public isc-dhcp
(string-append dir "/bin:" (string-append dir "/bin:"
dir "/sbin")) dir "/sbin"))
(list inetutils net-tools coreutils sed)))) (list inetutils net-tools coreutils sed))))
;; TODO(core-updates): should not be required anymore,
;; once <https://issues.guix.gnu.org/49290> has been merged.
,@(if (%current-target-system)
'((for-each
(lambda (file)
(substitute* file
(((assoc-ref native-inputs "bash"))
(assoc-ref inputs "bash"))))
(list (string-append libexec
"/dhclient-script")
(string-append libexec
"/.dhclient-script-real"))))
'())
#t)))))) #t))))))
(native-inputs (native-inputs