From faf715b1dcf9a7d984846f43c2110de2d4b896ff Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 8 May 2022 02:00:10 +0200 Subject: gnu: lighttpd: Fix bash reference. * gnu/packages/web.scm (lighttpd)[arguments]: Substitute SEARCH-INPUT-FILE for WHICH. [inputs]: Add bash-minimal. f fix lighttpd xcc --- gnu/packages/web.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index bc913664e3..fabe488c2a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2016 Clément Lassieur ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016, 2017, 2018, 2019, 2021 Arun Isaac -;;; Copyright © 2016–2021 Tobias Geerinckx-Rice +;;; Copyright © 2016–2022 Tobias Geerinckx-Rice ;;; Copyright © 2016 Bake Timmons ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017, 2018, 2020, 2021, 2022 Marius Bakke @@ -849,9 +849,9 @@ stream. Remote control of the module is possible over HTTP.") #:phases (modify-phases %standard-phases (add-after 'unpack 'embed-/bin/sh-reference - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/mod_ssi.c" - (("/bin/sh") (which "sh"))) + (("/bin/sh") (search-input-file inputs "/bin/sh"))) #t)) (add-after 'unpack 'fix-tests (lambda _ @@ -862,7 +862,8 @@ stream. Remote control of the module is possible over HTTP.") "{HOSTNAME} = \"127.0.0.1\";")) #t))))) (inputs - `(("cyrus-sasl" ,cyrus-sasl) + `(("bash-minimal" ,bash-minimal) + ("cyrus-sasl" ,cyrus-sasl) ("libev" ,libev) ("libunwind" ,libunwind) ("linux-pam" ,linux-pam) -- cgit v1.2.3