guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/03: gnu: guile-ssh: Use 'modify-phases'.


From: Ludovic Courtès
Subject: 01/03: gnu: guile-ssh: Use 'modify-phases'.
Date: Sun, 9 Oct 2016 21:25:14 +0000 (UTC)

civodul pushed a commit to branch master
in repository guix.

commit 8a8f6590ec90fcade622cb53a921d60af469d988
Author: Ludovic Courtès <address@hidden>
Date:   Sat Oct 8 16:09:28 2016 +0200

    gnu: guile-ssh: Use 'modify-phases'.
    
    * gnu/packages/ssh.scm (guile-ssh)[arguments]: Use 'modify-phases'.
---
 gnu/packages/ssh.scm |   40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 88bfd06..02e8c93 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"))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]