diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2025-07-25 23:10:47 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2025-08-23 16:56:31 +0200 |
| commit | a138cdb39f9dcc6d949aea3456b4d98aa90edeb9 (patch) | |
| tree | 2d1d1f3a3c4fde76dd96bd88a45e7f8bfa54f5f1 /gnu | |
| parent | ca03f7379050c93a51fadb00659481180572157c (diff) | |
gnu: dico: Hard-code file name of the default shell.
This fixes a regression introduced in
a33e152f2eb9927be5942b00bdaaecba737c650f whereby the ‘dicod’ Shepherd
service would fail to start with:
dicod[2]: /gnu/store/…-m4-1.4.19/bin/m4 -s exited with status 127
… due to /bin/sh missing in its least-authority environment and ‘SHELL’
being unset.
* gnu/packages/dico.scm (dico)[arguments]: Add ‘set-shell-file-name’
phase.
[inputs]: Add ‘bash-minimal’.
Change-Id: Ie6f8a7a462a2dedcbf7ea049e385e121da06e741
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/dico.scm | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/gnu/packages/dico.scm b/gnu/packages/dico.scm index 38f57dc24f5..16cd2ebd831 100644 --- a/gnu/packages/dico.scm +++ b/gnu/packages/dico.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015-2016, 2018, 2024 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2015-2016, 2018, 2024-2025 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> @@ -27,6 +27,7 @@ #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (gnu packages) + #:use-module (gnu packages bash) #:use-module (gnu packages crypto) #:use-module (gnu packages readline) #:use-module (gnu packages m4) @@ -56,6 +57,14 @@ "/share/guile/site/2.0") "--disable-static") #:phases (modify-phases %standard-phases + (add-before 'build 'set-shell-file-name + (lambda* (#:key inputs #:allow-other-keys) + ;; This code invokes "/bin/sh -c 'm4 -s ...'". + (substitute* "grecs/src/grecs-lex.c" + (("\"/bin/sh\"") + (string-append "\"" + (search-input-file inputs "/bin/sh") + "\""))))) (add-before 'check 'silence-guile (lambda _ ;; Guile is too talkative, which disturbs the test @@ -65,6 +74,7 @@ (native-inputs (list groff)) (inputs (list m4 ;used at run time + bash-minimal ;likewise pcre python-wrapper guile-2.2 |