diff options
author | Mark H Weaver <mhw@netris.org> | 2018-04-30 04:03:54 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2018-04-30 04:03:54 -0400 |
commit | 3d5ad159b336a9903b31d0be7ae052dbc8d5bfcc (patch) | |
tree | ee7dce4e436490a1db5f18e4bfad55511d2fff32 /gnu/packages/ssh.scm | |
parent | c77835db04ee20c0afe20600dc8f91a67bc2421e (diff) | |
parent | 8c21c64e59d3f4d223d8aeef91f06fdde7de1ab7 (diff) | |
download | guix-3d5ad159b336a9903b31d0be7ae052dbc8d5bfcc.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/ssh.scm')
-rw-r--r-- | gnu/packages/ssh.scm | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index d712e06431..112ccb3280 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -258,8 +258,20 @@ Additionally, various channel-specific options can be negotiated.") (substitute* (find-files "." "\\.scm$") (("\"libguile-ssh\"") (string-append "\"" libdir "/libguile-ssh\""))) - #t))))) - + #t)))) + (add-after 'install 'remove-bin-directory + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (examples (string-append + out "/share/guile-ssh/examples"))) + (mkdir-p examples) + (rename-file (string-append bin "/ssshd.scm") + (string-append examples "/ssshd.scm")) + (rename-file (string-append bin "/sssh.scm") + (string-append examples "/sssh.scm")) + (delete-file-recursively bin) + #t)))) ;; Tests are not parallel-safe. #:parallel-tests? #f)) (native-inputs `(("autoconf" ,autoconf) |