diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2016-08-11 12:35:21 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2016-08-11 13:20:19 +0300 |
| commit | 91c52629e866ee6beb0266252d64254f15e7868d (patch) | |
| tree | 561a58a6341c1b7965c791fb11e9c4f28453b899 | |
| parent | 0ec60d6e0341a99b9cc0af3127fbc14069866520 (diff) | |
gnu: corkscrew: Use 'modify-phases'.
* gnu/packages/ssh.scm (corkscrew)[arguments]: Use 'modify-phases'.
| -rw-r--r-- | gnu/packages/ssh.scm | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index da6784f2f25..b860d6e9240 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm | |||
| @@ -275,23 +275,22 @@ libssh library.") | |||
| 275 | ;; Replace configure phase as the ./configure script does not link | 275 | ;; Replace configure phase as the ./configure script does not link |
| 276 | ;; CONFIG_SHELL and SHELL passed as parameters | 276 | ;; CONFIG_SHELL and SHELL passed as parameters |
| 277 | '(#:phases | 277 | '(#:phases |
| 278 | (alist-replace | 278 | (modify-phases %standard-phases |
| 279 | 'configure | 279 | (replace 'configure |
| 280 | (lambda* (#:key outputs inputs system build target | 280 | (lambda* (#:key outputs inputs system build target |
| 281 | #:allow-other-keys #:rest args) | 281 | #:allow-other-keys #:rest args) |
| 282 | (let* ((configure (assoc-ref %standard-phases 'configure)) | 282 | (let* ((configure (assoc-ref %standard-phases 'configure)) |
| 283 | (prefix (assoc-ref outputs "out")) | 283 | (prefix (assoc-ref outputs "out")) |
| 284 | (bash (which "bash")) | 284 | (bash (which "bash")) |
| 285 | ;; Set --build and --host flags as the provided config.guess | 285 | ;; Set --build and --host flags as the provided config.guess |
| 286 | ;; is not able to detect them | 286 | ;; is not able to detect them |
| 287 | (flags `(,(string-append "--prefix=" prefix) | 287 | (flags `(,(string-append "--prefix=" prefix) |
| 288 | ,(string-append "--build=" build) | 288 | ,(string-append "--build=" build) |
| 289 | ,(string-append "--host=" (or target build))))) | 289 | ,(string-append "--host=" (or target build))))) |
| 290 | (setenv "CONFIG_SHELL" bash) | 290 | (setenv "CONFIG_SHELL" bash) |
| 291 | (zero? (apply system* bash | 291 | (zero? (apply system* bash |
| 292 | (string-append "." "/configure") | 292 | (string-append "." "/configure") |
| 293 | flags)))) | 293 | flags)))))))) |
| 294 | %standard-phases))) | ||
| 295 | (home-page "http://www.agroman.net/corkscrew") | 294 | (home-page "http://www.agroman.net/corkscrew") |
| 296 | (synopsis "Tunneling SSH through HTTP proxies") | 295 | (synopsis "Tunneling SSH through HTTP proxies") |
| 297 | (description | 296 | (description |
