ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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 @@ (define-public sshuttle
#: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"