me
/
guix
Archived
1
0
Fork 0
Code

gnu: fish: Fix build after upstream changes. 

The 2.5.0 release was incorrectly packaged, then fixed in place. This is,
in a way, a follow-up to commit 89eb56f05f.
See <https://github.com/fish-shell/fish-shell/issues/3807>.

Reported by ng0 <contact.ng0@cryptolab.net>.

* gnu/packages/shells.scm (fish)[source]: Update hash.
[native-inputs]: Remove autoconf, automake, and libtool.
[arguments]: Remove ‘bootstrap’ phase.
master
Tobias Geerinckx-Rice 2017-02-17 16:01:22 +01:00
parent bef7a9a305
commit 4f4bca0f10
No known key found for this signature in database
GPG Key ID: 91CCDB9B48541B99
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/shells.scm
View File

@ -91,7 +91,7 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).")
version "/fish-" version ".tar.gz")) version "/fish-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0kn2n9qr9cksg2cl78f3w0yd24368d35djhi6w5x3gbdxk23ywq3")) "19djav128nkhjxgfhwhc32i5y9d9c3karbh5yg67kqrdranyvh7q"))
(modules '((guix build utils))) (modules '((guix build utils)))
;; Don't try to install /etc/fish/config.fish. ;; Don't try to install /etc/fish/config.fish.
(snippet (snippet
@ -99,12 +99,7 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).")
((".*INSTALL.*sysconfdir.*fish.*") ""))))) ((".*INSTALL.*sysconfdir.*fish.*") "")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("doxygen" ,doxygen) `(("doxygen" ,doxygen)))
;; XXX These are needed to bootstrap the 2.5.0 tarball, and can probably
;; be removed along with the ‘bootstrap’ phase on the next update.
("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)))
(inputs (inputs
`(("bc" ,bc) `(("bc" ,bc)
("ncurses" ,ncurses) ("ncurses" ,ncurses)
@ -125,10 +120,7 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).")
"/bin/bc"))) "/bin/bc")))
(substitute* "share/functions/fish_update_completions.fish" (substitute* "share/functions/fish_update_completions.fish"
(("python") (which "python"))) (("python") (which "python")))
#t)) #t)))))
(add-before 'configure 'bootstrap
(lambda _
(zero? (system* "autoreconf" "-vfi")))))))
(synopsis "The friendly interactive shell") (synopsis "The friendly interactive shell")
(description (description
"Fish (friendly interactive shell) is a shell focused on interactive use, "Fish (friendly interactive shell) is a shell focused on interactive use,