amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into core-updates-frozen

Browse source 
Conflicts:
	gnu/packages/bioinformatics.scm
	gnu/packages/cmake.scm
	gnu/packages/curl.scm
	gnu/packages/emacs-xyz.scm
	gnu/packages/gpodder.scm
	gnu/packages/music.scm
	gnu/packages/patches/glibc-bootstrap-system.patch
	gnu/packages/python-xyz.scm
	gnu/packages/shells.scm
	gnu/packages/statistics.scm
This commit is contained in:
Marius Bakke 2021-07-29 22:34:57 +02:00
commit b029be2ee0
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
100 changed files with 5664 additions and 43929 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -47,6 +47,7 @@
#:use-module (gnu packages aspell)
#:use-module (gnu packages assembly)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages boost)
#:use-module (gnu packages code)
#:use-module (gnu packages crates-io)
@ -524,27 +525,23 @@ Wordstar-, EMACS-, Pico, Nedit or vi-like key bindings. e3 can be used on
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("libbsd" ,libbsd)
`(("diffutils" ,diffutils)
("libbsd" ,libbsd)
("ncurses" ,ncurses)))
(arguments
;; No test suite available.
`(#:tests? #f
#:make-flags (list (string-append "prefix=" %output)
(string-append "CC=" ,(cc-for-target)))
(string-append "CC=" ,(cc-for-target))
(string-append "PKG_CONFIG=" ,(pkg-config-for-target)))
#:phases (modify-phases %standard-phases
(delete 'configure) ; no configure script
(add-before 'build 'correct-location-of-difftool
(lambda _
(add-before 'build 'correct-location-of-diff
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "buffer.c"
(("/usr/bin/diff")
(which "diff")))))
(add-before 'build 'pkg-config-for-cross-compiling-target
(lambda _
(substitute* "GNUmakefile"
(("pkg-config")
(or (which "pkg-config")
(string-append ,(%current-target-system)
"-pkg-config"))))))
(string-append (assoc-ref inputs "diffutils")
"/bin/diff")))))
(add-before 'install 'patch-tutorial-location
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "mg.1"