(address . guix-patches@gnu.org)(name . Michael Rohleder)(address . mike@rohleder.de)
20220129142950.26777-1-mike@rohleder.de
* gnu/packages/ssh.scm (mosh)[arguments]: Add substitution for mosh-server and
-client. Remove unneeded 'wrap phase.
---
For some reason setting $PATH in 'wrap phase doesn't work anymore, the perl
script doesn't find it's binaries, so I substitute them there.
gnu/packages/ssh.scm | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
Toggle diff (40 lines)
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 4dd8bb6d96..c296029fc0 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -17,6 +17,7 @@
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
+;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -478,19 +479,15 @@ (define-public mosh
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-FHS-file-names
- (lambda _
- (substitute* "scripts/mosh.pl"
- (("/bin/sh")
- (which "sh")))
- #t))
- (add-after 'install 'wrap
(lambda* (#:key outputs #:allow-other-keys)
- ;; Make sure 'mosh' can find 'mosh-client' and
- ;; 'mosh-server'.
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")))
- (wrap-program (string-append bin "/mosh")
- `("PATH" ":" prefix (,bin)))))))))
+ (substitute* "scripts/mosh.pl"
+ (("/bin/sh") (which "sh"))
+ (("\\$server = 'mosh-server'")
+ (string-append "$server = '" bin "/mosh-server'"))
+ (("\\$client = 'mosh-client'")
+ (string-append "$client = '" bin "/mosh-client'")))))))))
(native-inputs
(list pkg-config))
(inputs
--
2.34.0