nckx pushed a commit to branch master
in repository guix.
commit c32863e094d3489d2e08ccb3188988d7c6410976
Author: Tobias Geerinckx-Rice <[email protected]>
Date: Thu Sep 27 23:38:36 2018 +0200
gnu: sshuttle: Patch FHS assumptions.
Reported-By: Nam Nguyen <[email protected]>
* gnu/packages/vpn.scm (sshuttle)[arguments]: Set correct paths to 'env'
and 'sh'.
---
gnu/packages/vpn.scm | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 85bbe7e..de5df50 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -347,6 +347,17 @@ private network between hosts on the internet.")
(base32
"0pqk43kd7crqhg6qgnl8kapncwgw1xgaf02zarzypcw64kvdih9h"))))
(build-system python-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-FHS-file-names
+ (lambda _
+ (substitute* "sshuttle/client.py"
+ (("/usr/bin/env") (which "env")))
+ (substitute* "sshuttle/ssh.py"
+ ;; Perhaps this is unreachable, but don't let's take risks.
+ (("/bin/sh") (which "sh")))
+ #t)))))
(native-inputs
`(("python-setuptools-scm" ,python-setuptools-scm)
;; For tests only.
