amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: isc-dhcp: Address TODOs.

Browse source 
* gnu/packages/admin.scm (isc-dhcp): Remove trailing #t.
[phases]{post-install}: Remove the 'native-inputs' argument.
{post-configure}: Do not patch the libexec scripts.
[inputs]{bash}: Remove conditional.
This commit is contained in:
Maxim Cournoyer 2021-12-17 15:24:06 -05:00
parent 1c3a922542
commit d3f195f77e
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 5 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

34
gnu/packages/admin.scm
View file

@ -1206,8 +1206,7 @@ connection alive.")
(("^RELEASETYPE=.*") (("^RELEASETYPE=.*")
(format #f "RELEASETYPE=~a\n" ,bind-release-type)) (format #f "RELEASETYPE=~a\n" ,bind-release-type))
(("^RELEASEVER=.*") (("^RELEASEVER=.*")
(format #f "RELEASEVER=~a\n" ,bind-release-version))) (format #f "RELEASEVER=~a\n" ,bind-release-version)))))
#t))
,@(if (%current-target-system) ,@(if (%current-target-system)
'((add-before 'configure 'fix-bind-cross-compilation '((add-before 'configure 'fix-bind-cross-compilation
(lambda _ (lambda _
@ -1216,8 +1215,7 @@ connection alive.")
"--host=$host_alias")) "--host=$host_alias"))
;; BIND needs a native compiler because the DHCP ;; BIND needs a native compiler because the DHCP
;; build system uses the built 'gen' executable. ;; build system uses the built 'gen' executable.
(setenv "BUILD_CC" "gcc") (setenv "BUILD_CC" "gcc"))))
#t)))
'()) '())
(add-after 'configure 'post-configure (add-after 'configure 'post-configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
@ -1255,11 +1253,7 @@ connection alive.")
"--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"))
@ -1282,31 +1276,13 @@ connection alive.")
,(map (lambda (dir) ,(map (lambda (dir)
(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))))))
(native-inputs (native-inputs
(list perl file)) (list perl file))
(inputs `(("inetutils" ,inetutils) (inputs `(("inetutils" ,inetutils)
;; TODO(core-updates): simply make this unconditional ("bash" ,(canonical-package bash-minimal)) ;for wrap-program
,@(if (%current-target-system)
;; for wrap-program
`(("bash" ,(canonical-package bash-minimal)))
'())
,@(if (hurd-target?) '() ,@(if (hurd-target?) '()
`(("net-tools" ,net-tools) `(("net-tools" ,net-tools)
("iproute" ,iproute))) ("iproute" ,iproute)))