diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-10-08 16:09:28 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-10-09 23:23:11 +0200 |
| commit | 8a8f6590ec90fcade622cb53a921d60af469d988 (patch) | |
| tree | a884489234cf7632c8eb18a4e4c301ed6cdfc28e /gnu/packages/ssh.scm | |
| parent | a9c958b5aa55a729a1530b2e23e088bb982f696c (diff) | |
| download | gnu-guix-8a8f6590ec90fcade622cb53a921d60af469d988.tar gnu-guix-8a8f6590ec90fcade622cb53a921d60af469d988.tar.gz | |
gnu: guile-ssh: Use 'modify-phases'.
* gnu/packages/ssh.scm (guile-ssh)[arguments]: Use 'modify-phases'.
Diffstat (limited to 'gnu/packages/ssh.scm')
| -rw-r--r-- | gnu/packages/ssh.scm | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 88bfd062df..02e8c93126 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -223,28 +223,26 @@ Additionally, various channel-specific options can be negotiated.") "04zs1cykwdyj51ag62ymrkgsja9dbhbaaglkvbfbac0bkxl2ir6d")))) (build-system gnu-build-system) (arguments - '(#:phases (alist-cons-after - 'unpack 'autoreconf - (lambda* (#:key inputs #:allow-other-keys) - (chmod "doc/version.texi" #o777) ;make it writable - (zero? (system* "autoreconf" "-vfi"))) - (alist-cons-after - 'install 'fix-libguile-ssh-file-name - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (libdir (string-append out "/lib")) - (guiledir (string-append out - "/share/guile/site/2.0"))) - (substitute* (find-files guiledir ".scm") - (("\"libguile-ssh\"") - (string-append "\"" libdir "/libguile-ssh\""))) + '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'autoreconf + (lambda* (#:key inputs #:allow-other-keys) + (chmod "doc/version.texi" #o777) ;make it writable + (zero? (system* "autoreconf" "-vfi")))) + (add-after 'install 'fix-libguile-ssh-file-name + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (libdir (string-append out "/lib")) + (guiledir (string-append out + "/share/guile/site/2.0"))) + (substitute* (find-files guiledir ".scm") + (("\"libguile-ssh\"") + (string-append "\"" libdir "/libguile-ssh\""))) - ;; Make sure it works. - (setenv "GUILE_LOAD_PATH" guiledir) - (setenv "GUILE_LOAD_COMPILED_PATH" guiledir) - (zero? - (system* "guile" "-c" "(use-modules (ssh session))")))) - %standard-phases)) + ;; Make sure it works. + (setenv "GUILE_LOAD_PATH" guiledir) + (setenv "GUILE_LOAD_COMPILED_PATH" guiledir) + (zero? + (system* "guile" "-c" "(use-modules (ssh session))")))))) #:configure-flags (list (string-append "--with-guilesitedir=" (assoc-ref %outputs "out") "/share/guile/site/2.0")) |