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

gnu: lsh: Use 'modify-phases'. 

* gnu/packages/lsh.scm (lsh)[arguments]: Use 'modify-phases' instead of
'alist-cons-before'.
This commit is contained in:
Ludovic Courtès 2016-02-23 18:20:47 +01:00
parent ea84bd88da
commit 03b93ed70e
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gnu/packages/lsh.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -113,26 +113,25 @@ basis for almost any application.")
#:tests? #f #:tests? #f
#:phases #:phases
(alist-cons-before (modify-phases %standard-phases
'configure 'pre-configure (add-before 'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let* ((nettle (assoc-ref inputs "nettle")) (let* ((nettle (assoc-ref inputs "nettle"))
(sexp-conv (string-append nettle "/bin/sexp-conv"))) (sexp-conv (string-append nettle "/bin/sexp-conv")))
;; Make sure 'lsh' and 'lshd' pick 'sexp-conv' in the right place ;; Make sure 'lsh' and 'lshd' pick 'sexp-conv' in the right place
;; by default. ;; by default.
(substitute* "src/environ.h.in" (substitute* "src/environ.h.in"
(("^#define PATH_SEXP_CONV.*") (("^#define PATH_SEXP_CONV.*")
(string-append "#define PATH_SEXP_CONV \"" (string-append "#define PATH_SEXP_CONV \""
sexp-conv "\"\n"))) sexp-conv "\"\n")))
;; Same for the 'lsh-authorize' script. ;; Same for the 'lsh-authorize' script.
(substitute* "src/lsh-authorize" (substitute* "src/lsh-authorize"
(("=sexp-conv") (("=sexp-conv")
(string-append "=" sexp-conv)))) (string-append "=" sexp-conv))))
;; Tests rely on $USER being set. ;; Tests rely on $USER being set.
(setenv "USER" "guix")) (setenv "USER" "guix"))))))
%standard-phases)))
(home-page "http://www.lysator.liu.se/~nisse/lsh/") (home-page "http://www.lysator.liu.se/~nisse/lsh/")
(synopsis "GNU implementation of the Secure Shell (ssh) protocols") (synopsis "GNU implementation of the Secure Shell (ssh) protocols")
(description (description