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

gnu: sudo: Use ‘modify-phases’ syntax. 

* gnu/packages/admin.scm (sudo)[arguments]: Use ‘modify-phases’.
This commit is contained in:
Tobias Geerinckx-Rice 2017-08-07 16:26:31 +02:00
parent 4f4134c26d
commit 7fae2063f8
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gnu/packages/admin.scm
View File

@ -13,7 +13,7 @@
;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at> ;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at>
;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net> ;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net> ;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2017 Ben Sturmfels <ben@sturm.com.au> ;;; Copyright © 2017 Ben Sturmfels <ben@sturm.com.au>
;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com> ;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com>
@ -849,29 +849,29 @@ system administrator.")
;; Avoid non-determinism; see <http://bugs.gnu.org/21918>. ;; Avoid non-determinism; see <http://bugs.gnu.org/21918>.
#:parallel-build? #f #:parallel-build? #f
#:phases (alist-cons-before #:phases
'configure 'pre-configure (modify-phases %standard-phases
(lambda _ (add-before 'configure 'pre-configure
(substitute* "src/sudo_usage.h.in" (lambda _
;; Do not capture 'configure' arguments since we would (substitute* "src/sudo_usage.h.in"
;; unduly retain references, and also because the ;; Do not capture 'configure' arguments since we would
;; CPPFLAGS above would close the string literal ;; unduly retain references, and also because the
;; prematurely. ;; CPPFLAGS above would close the string literal
(("@CONFIGURE_ARGS@") "\"\"")) ;; prematurely.
(substitute* (find-files "." "Makefile\\.in") (("@CONFIGURE_ARGS@") "\"\""))
(("-o [[:graph:]]+ -g [[:graph:]]+") (substitute* (find-files "." "Makefile\\.in")
;; Allow installation as non-root. (("-o [[:graph:]]+ -g [[:graph:]]+")
"") ;; Allow installation as non-root.
(("^install: (.*)install-sudoers(.*)" _ before after) "")
;; Don't try to create /etc/sudoers. (("^install: (.*)install-sudoers(.*)" _ before after)
(string-append "install: " before after "\n")) ;; Don't try to create /etc/sudoers.
(("\\$\\(DESTDIR\\)\\$\\(rundir\\)") (string-append "install: " before after "\n"))
;; Don't try to create /run/sudo. (("\\$\\(DESTDIR\\)\\$\\(rundir\\)")
"$(TMPDIR)/dummy") ;; Don't try to create /run/sudo.
(("\\$\\(DESTDIR\\)\\$\\(vardir\\)") "$(TMPDIR)/dummy")
;; Don't try to create /var/db/sudo. (("\\$\\(DESTDIR\\)\\$\\(vardir\\)")
"$(TMPDIR)/dummy"))) ;; Don't try to create /var/db/sudo.
%standard-phases) "$(TMPDIR)/dummy")))))
;; XXX: The 'testsudoers' test series expects user 'root' to exist, but ;; XXX: The 'testsudoers' test series expects user 'root' to exist, but
;; the chroot's /etc/passwd doesn't have it. Turn off the tests. ;; the chroot's /etc/passwd doesn't have it. Turn off the tests.