me
/
guix
Archived
1
0
Fork 0
Code

gnu: mg: Fix reference to native diffutils. 

* gnu/packages/text-editors.scm (mg)[inputs]: Add diffutils.
[arguments]: Refer to it in the 'correct-location-of-diff phase.
master
Tobias Geerinckx-Rice 2021-07-18 14:14:27 +02:00
parent 8b1bde7bb3
commit 7f2b9306ee
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
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,7 +525,8 @@ 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.
@ -533,11 +535,12 @@ Wordstar-, EMACS-, Pico, Nedit or vi-like key bindings. e3 can be used on
(string-append "CC=" ,(cc-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")))))
(string-append (assoc-ref inputs "diffutils")
"/bin/diff")))))
(add-before 'build 'pkg-config-for-cross-compiling-target
(lambda _
(substitute* "GNUmakefile"