mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-20 06:37:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: kakoune: Fix build after Boost ABI change.

Browse source 
Also remove now-obsolete snippet and inputs.

* gnu/packages/text-editors.scm (kakoune)[source]: Remove gzip substitution.
[arguments]: Drop CPPFLAGS from #:make-flags.
[native-inputs]: Remove GCC-5.
[inputs]: Remove gcc:lib.
This commit is contained in:
Marius Bakke 2017-03-29 14:23:56 +02:00
parent 04952bd732
commit c7f7a5bac2
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gnu/packages/text-editors.scm
View file

@ -99,21 +99,10 @@ (define-public kakoune
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"19qs99l8r9p1vi5pxxx9an22fvi7xx40qw3jh2cnh2mbacawvdyb")) "19qs99l8r9p1vi5pxxx9an22fvi7xx40qw3jh2cnh2mbacawvdyb"))))
(modules '((guix build utils)))
(snippet
;; Kakoune uses 'gzip' to compress its manpages. Make sure
;; timestamps are not preserved for reproducibility.
'(begin
(substitute* "src/Makefile"
(("gzip -f") "gzip -f --no-name"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
;; Boost is compiled with the older ABI, so we can't use
;; the new ABI if we want to link againt it.
"CPPFLAGS=-D_GLIBCXX_USE_CXX11_ABI=0")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-source (add-after 'unpack 'patch-source
@ -136,11 +125,9 @@ (define-public kakoune
;; Out git downloader doesn't give us write permissions, but ;; Out git downloader doesn't give us write permissions, but
;; without them the tests fail. ;; without them the tests fail.
(zero? (system* "chmod" "-R" "u+w" "../test"))))))) (zero? (system* "chmod" "-R" "u+w" "../test")))))))
(native-inputs `(("gcc" ,gcc-5) (native-inputs `(("asciidoc" ,asciidoc)
("asciidoc" ,asciidoc)
("ruby" ,ruby))) ("ruby" ,ruby)))
(inputs `(("gcc:lib" ,gcc-5 "lib") (inputs `(("ncurses" ,ncurses)
("ncurses" ,ncurses)
("boost" ,boost))) ("boost" ,boost)))
(synopsis "Vim-inspired code editor") (synopsis "Vim-inspired code editor")
(description (description