diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-04-25 15:53:41 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-04-25 15:53:41 +0200 |
| commit | a9fe3882b9400d6a49ca95e136e78477b3e81a07 (patch) | |
| tree | b724ec1ed54d4a2c1b617a63eb05b98721f5d48a /gnu/packages/ssh.scm | |
| parent | 68c4759baa4c1bb87e1c7c5568d5cdf4e1434fb1 (diff) | |
| parent | 0afeda65218ed0c82ab18762111c52a9fedd2582 (diff) | |
| download | guix-patches-a9fe3882b9400d6a49ca95e136e78477b3e81a07.tar guix-patches-a9fe3882b9400d6a49ca95e136e78477b3e81a07.tar.gz | |
Merge branch 'master' into staging
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 afd41cd8e7..e4a277c5e6 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -259,8 +259,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) |