From 9b998a8d63c0855ebec7d01010d2f1f66607b033 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 8 Sep 2024 02:00:00 +0200 Subject: [PATCH] =?UTF-8?q?gnu:=20sshuttle:=20Refer=20to=20a=20fixed=20?= =?UTF-8?q?=E2=80=98sh=E2=80=99=20and=20avoid=20WHICH.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/vpn.scm (sshuttle)[arguments]: Use SEARCH-INPUT-FILES for ‘env’ (rather than WHICH) and ‘sh’ (rather than whatever's in $PATH). Change-Id: Ieacae72a849cdcbef4ae9e8f24c0d95879b1dd48 --- gnu/packages/vpn.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 4cb871feb25..0f7300ff51b 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -1005,11 +1005,13 @@ private network between hosts on the internet.") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-FHS-file-names - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (substitute* "sshuttle/client.py" - (("/usr/bin/env") (which "env"))) + (("(/usr)?(/bin/env)" _ _ command) + (search-input-file inputs command))) (substitute* "sshuttle/ssh.py" - (("/bin/sh") "sh")))) + (("/bin/sh" command) + (search-input-file inputs command))))) (add-after 'install 'install-documentation (lambda _ (with-directory-excursion "docs"