futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: sshuttle: Refer to a fixed ‘sh’ and avoid WHICH.

Browse Source 
* 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
This commit is contained in:
Tobias Geerinckx-Rice 2024-09-08 02:00:00 +02:00
parent 4f86fa2017
commit 9b998a8d63
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/packages/vpn.scm
View File

@ -1005,11 +1005,13 @@ private network between hosts on the internet.")
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-FHS-file-names (add-after 'unpack 'patch-FHS-file-names
(lambda _ (lambda* (#:key inputs #:allow-other-keys)
(substitute* "sshuttle/client.py" (substitute* "sshuttle/client.py"
(("/usr/bin/env") (which "env"))) (("(/usr)?(/bin/env)" _ _ command)
(search-input-file inputs command)))
(substitute* "sshuttle/ssh.py" (substitute* "sshuttle/ssh.py"
(("/bin/sh") "sh")))) (("/bin/sh" command)
(search-input-file inputs command)))))
(add-after 'install 'install-documentation (add-after 'install 'install-documentation
(lambda _ (lambda _
(with-directory-excursion "docs" (with-directory-excursion "docs"