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

gnu: corkscrew: Use 'modify-phases'. 

* gnu/packages/ssh.scm (corkscrew)[arguments]: Use 'modify-phases'.
This commit is contained in:
Efraim Flashner 2016-08-11 12:35:21 +03:00
parent 0ec60d6e03
commit 91c52629e8
No known key found for this signature in database
GPG Key ID: F4C1D3917EACEE93
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gnu/packages/ssh.scm
View File

@ -275,23 +275,22 @@ libssh library.")
;; Replace configure phase as the ./configure script does not link ;; Replace configure phase as the ./configure script does not link
;; CONFIG_SHELL and SHELL passed as parameters ;; CONFIG_SHELL and SHELL passed as parameters
'(#:phases '(#:phases
(alist-replace (modify-phases %standard-phases
'configure (replace 'configure
(lambda* (#:key outputs inputs system build target (lambda* (#:key outputs inputs system build target
#:allow-other-keys #:rest args) #:allow-other-keys #:rest args)
(let* ((configure (assoc-ref %standard-phases 'configure)) (let* ((configure (assoc-ref %standard-phases 'configure))
(prefix (assoc-ref outputs "out")) (prefix (assoc-ref outputs "out"))
(bash (which "bash")) (bash (which "bash"))
;; Set --build and --host flags as the provided config.guess ;; Set --build and --host flags as the provided config.guess
;; is not able to detect them ;; is not able to detect them
(flags `(,(string-append "--prefix=" prefix) (flags `(,(string-append "--prefix=" prefix)
,(string-append "--build=" build) ,(string-append "--build=" build)
,(string-append "--host=" (or target build))))) ,(string-append "--host=" (or target build)))))
(setenv "CONFIG_SHELL" bash) (setenv "CONFIG_SHELL" bash)
(zero? (apply system* bash (zero? (apply system* bash
(string-append "." "/configure") (string-append "." "/configure")
flags)))) flags))))))))
%standard-phases)))
(home-page "http://www.agroman.net/corkscrew") (home-page "http://www.agroman.net/corkscrew")
(synopsis "Tunneling SSH through HTTP proxies") (synopsis "Tunneling SSH through HTTP proxies")
(description (description