me/guix
Archived
1
0
Fork 0
Code Activity

gnu: sshuttle: Rely on $PATH to find a POSIX sh.

Browse source 
This fixes a regression introduced in commit
c32863e094, where the sshuttle client
will try to invoke its own /gnu/store/.../bin/sh on the server.

Rely on $PATH instead of regressing to upstream's hard-coded /bin/sh.

* gnu/packages/vpn.scm (sshuttle)[arguments]: SUBSTITUTE* "sh" for
"/bin/sh".
This commit is contained in:
Tobias Geerinckx-Rice 2018-09-30 21:12:06 +02:00
parent f2bc53af70
commit 0e2d3ce20e
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gnu/packages/vpn.scm
View file

@ -355,8 +355,7 @@ private network between hosts on the internet.")
(substitute* "sshuttle/client.py" (substitute* "sshuttle/client.py"
(("/usr/bin/env") (which "env"))) (("/usr/bin/env") (which "env")))
(substitute* "sshuttle/ssh.py" (substitute* "sshuttle/ssh.py"
;; Perhaps this is unreachable, but don't let's take risks. (("/bin/sh") "sh"))
(("/bin/sh") (which "sh")))
#t))))) #t)))))
(native-inputs (native-inputs
`(("python-setuptools-scm" ,python-setuptools-scm) `(("python-setuptools-scm" ,python-setuptools-scm)