me/guix
Archived
1
0
Fork 0
Code Activity

gnu: shadow: Use the cross-compiled shell at runtime.

Browse source 
Make sure that the executed shell at runtime is the cross-compiled shell and
not the native shell.

* gnu/packages/admin.scm (shadow)[arguments]: Add a set-runtime-shell phase.
[inputs]: Add bash-minimal when cross-compiling.
This commit is contained in:
Mathieu Othacehe 2021-08-29 18:54:47 +02:00
parent 5fdc46a9fe
commit 994d8ce394
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gnu/packages/admin.scm
View file

@ -29,7 +29,7 @@
;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2019, 2021 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2019, 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019, 2020, 2021 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
@ -824,6 +824,17 @@ hostname.")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
,@(if (%current-target-system)
'((add-before 'configure 'set-runtime-shell
(lambda* (#:key inputs #:allow-other-keys)
(let ((shell (string-append
(assoc-ref inputs "bash")
"/bin/bash")))
(setenv "RUNTIME_SHELL" shell)
(substitute* "configure.ac"
(("\\$SHELL")
"$RUNTIME_SHELL"))))))
'())
(add-before 'build 'set-nscd-file-name (add-before 'build 'set-nscd-file-name
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Use the right file name for nscd. ;; Use the right file name for nscd.
@ -848,7 +859,10 @@ hostname.")
(inputs (inputs
`(,@(if (hurd-target?) `(,@(if (hurd-target?)
'() '()
`(("linux-pam" ,linux-pam))))) `(("linux-pam" ,linux-pam)))
,@(if (%current-target-system)
`(("bash" ,bash-minimal))
'())))
(home-page "https://github.com/shadow-maint/shadow") (home-page "https://github.com/shadow-maint/shadow")
(synopsis "Authentication-related tools such as passwd, su, and login") (synopsis "Authentication-related tools such as passwd, su, and login")
(description (description