mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
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.
This commit is contained in:
parent
bef7a9a305
commit
4f4bca0f10
1 changed files with 3 additions and 11 deletions
|
@ -91,7 +91,7 @@ (define-public fish
|
|||
version "/fish-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0kn2n9qr9cksg2cl78f3w0yd24368d35djhi6w5x3gbdxk23ywq3"))
|
||||
"19djav128nkhjxgfhwhc32i5y9d9c3karbh5yg67kqrdranyvh7q"))
|
||||
(modules '((guix build utils)))
|
||||
;; Don't try to install /etc/fish/config.fish.
|
||||
(snippet
|
||||
|
@ -99,12 +99,7 @@ (define-public fish
|
|||
((".*INSTALL.*sysconfdir.*fish.*") "")))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("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)))
|
||||
`(("doxygen" ,doxygen)))
|
||||
(inputs
|
||||
`(("bc" ,bc)
|
||||
("ncurses" ,ncurses)
|
||||
|
@ -125,10 +120,7 @@ (define-public fish
|
|||
"/bin/bc")))
|
||||
(substitute* "share/functions/fish_update_completions.fish"
|
||||
(("python") (which "python")))
|
||||
#t))
|
||||
(add-before 'configure 'bootstrap
|
||||
(lambda _
|
||||
(zero? (system* "autoreconf" "-vfi")))))))
|
||||
#t)))))
|
||||
(synopsis "The friendly interactive shell")
|
||||
(description
|
||||
"Fish (friendly interactive shell) is a shell focused on interactive use,
|
||||
|
|
Loading…
Reference in a new issue