nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: guile-ssh: Use 'modify-phases'. 

* gnu/packages/ssh.scm (guile-ssh)[arguments]: Use 'modify-phases'.
master
Ludovic Courtès 2016-10-08 16:09:28 +02:00
parent a9c958b5aa
commit 8a8f6590ec
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
gnu/packages/ssh.scm
View File

@ -223,28 +223,26 @@ Additionally, various channel-specific options can be negotiated.")
"04zs1cykwdyj51ag62ymrkgsja9dbhbaaglkvbfbac0bkxl2ir6d")))) "04zs1cykwdyj51ag62ymrkgsja9dbhbaaglkvbfbac0bkxl2ir6d"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-cons-after '(#:phases (modify-phases %standard-phases
'unpack 'autoreconf (add-after 'unpack 'autoreconf
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(chmod "doc/version.texi" #o777) ;make it writable (chmod "doc/version.texi" #o777) ;make it writable
(zero? (system* "autoreconf" "-vfi"))) (zero? (system* "autoreconf" "-vfi"))))
(alist-cons-after (add-after 'install 'fix-libguile-ssh-file-name
'install 'fix-libguile-ssh-file-name (lambda* (#:key outputs #:allow-other-keys)
(lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out"))
(let* ((out (assoc-ref outputs "out")) (libdir (string-append out "/lib"))
(libdir (string-append out "/lib")) (guiledir (string-append out
(guiledir (string-append out "/share/guile/site/2.0")))
"/share/guile/site/2.0"))) (substitute* (find-files guiledir ".scm")
(substitute* (find-files guiledir ".scm") (("\"libguile-ssh\"")
(("\"libguile-ssh\"") (string-append "\"" libdir "/libguile-ssh\"")))
(string-append "\"" libdir "/libguile-ssh\"")))
;; Make sure it works. ;; Make sure it works.
(setenv "GUILE_LOAD_PATH" guiledir) (setenv "GUILE_LOAD_PATH" guiledir)
(setenv "GUILE_LOAD_COMPILED_PATH" guiledir) (setenv "GUILE_LOAD_COMPILED_PATH" guiledir)
(zero? (zero?
(system* "guile" "-c" "(use-modules (ssh session))")))) (system* "guile" "-c" "(use-modules (ssh session))"))))))
%standard-phases))
#:configure-flags (list (string-append "--with-guilesitedir=" #:configure-flags (list (string-append "--with-guilesitedir="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/share/guile/site/2.0")) "/share/guile/site/2.0"))