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

gnu: corkscrew: Clean up dead code. 

* gnu/packages/ssh.scm (corkscrew)[arguments]: Remove unnecessary
variables and procedure calls.
This commit is contained in:
Tobias Geerinckx-Rice 2018-06-22 21:49:05 +02:00
parent d26563323d
commit 5b34f56c1d
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/packages/ssh.scm
View File

@ -329,25 +329,21 @@ libssh library.")
"1gmhas4va6gd70i2x2mpxpwpgww6413mji29mg282jms3jscn3qd")))) "1gmhas4va6gd70i2x2mpxpwpgww6413mji29mg282jms3jscn3qd"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
;; Replace configure phase as the ./configure script does not link
;; CONFIG_SHELL and SHELL passed as parameters
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
(lambda* (#:key outputs inputs system build target ;; Replace configure phase as the ./configure script does not like
#:allow-other-keys #:rest args) ;; CONFIG_SHELL and SHELL passed as parameters
(let* ((configure (assoc-ref %standard-phases 'configure)) (lambda* (#:key outputs build target #:allow-other-keys)
(prefix (assoc-ref outputs "out")) (let* ((out (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=" out)
,(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)
(apply invoke bash (apply invoke bash "./configure" flags))))
(string-append "." "/configure")
flags))))
(add-after 'install 'install-documentation (add-after 'install 'install-documentation
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))