[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/09: gnu: corkscrew: Use 'modify-phases'.
From: |
Efraim Flashner |
Subject: |
09/09: gnu: corkscrew: Use 'modify-phases'. |
Date: |
Thu, 11 Aug 2016 10:20:35 +0000 (UTC) |
efraim pushed a commit to branch master
in repository guix.
commit 91c52629e866ee6beb0266252d64254f15e7868d
Author: Efraim Flashner <address@hidden>
Date: Thu Aug 11 12:35:21 2016 +0300
gnu: corkscrew: Use 'modify-phases'.
* gnu/packages/ssh.scm (corkscrew)[arguments]: Use 'modify-phases'.
---
gnu/packages/ssh.scm | 33 ++++++++++++++++-----------------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index da6784f..b860d6e 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -275,23 +275,22 @@ libssh library.")
;; Replace configure phase as the ./configure script does not link
;; CONFIG_SHELL and SHELL passed as parameters
'(#:phases
- (alist-replace
- 'configure
- (lambda* (#:key outputs inputs system build target
- #:allow-other-keys #:rest args)
- (let* ((configure (assoc-ref %standard-phases 'configure))
- (prefix (assoc-ref outputs "out"))
- (bash (which "bash"))
- ;; Set --build and --host flags as the provided config.guess
- ;; is not able to detect them
- (flags `(,(string-append "--prefix=" prefix)
- ,(string-append "--build=" build)
- ,(string-append "--host=" (or target build)))))
- (setenv "CONFIG_SHELL" bash)
- (zero? (apply system* bash
- (string-append "." "/configure")
- flags))))
- %standard-phases)))
+ (modify-phases %standard-phases
+ (replace 'configure
+ (lambda* (#:key outputs inputs system build target
+ #:allow-other-keys #:rest args)
+ (let* ((configure (assoc-ref %standard-phases 'configure))
+ (prefix (assoc-ref outputs "out"))
+ (bash (which "bash"))
+ ;; Set --build and --host flags as the provided
config.guess
+ ;; is not able to detect them
+ (flags `(,(string-append "--prefix=" prefix)
+ ,(string-append "--build=" build)
+ ,(string-append "--host=" (or target build)))))
+ (setenv "CONFIG_SHELL" bash)
+ (zero? (apply system* bash
+ (string-append "." "/configure")
+ flags))))))))
(home-page "http://www.agroman.net/corkscrew")
(synopsis "Tunneling SSH through HTTP proxies")
(description
- branch master updated (10692b2 -> 91c5262), Efraim Flashner, 2016/08/11
- 02/09: gnu: freeimpi: Update to 1.5.3., Efraim Flashner, 2016/08/11
- 06/09: gnu: mosh: Update source location., Efraim Flashner, 2016/08/11
- 03/09: gnu: ffmpeg: Update to 3.1.2., Efraim Flashner, 2016/08/11
- 08/09: gnu: mosh: Update to 1.2.6., Efraim Flashner, 2016/08/11
- 07/09: gnu: mosh: Use 'modify-phases'., Efraim Flashner, 2016/08/11
- 04/09: gnu: obs: Update to 0.15.4., Efraim Flashner, 2016/08/11
- 01/09: gnu: dico: Update to 2.3., Efraim Flashner, 2016/08/11
- 05/09: gnu: mpv: Update to 0.18.1., Efraim Flashner, 2016/08/11
- 09/09: gnu: corkscrew: Use 'modify-phases'.,
Efraim Flashner <=