[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: gnu: mg: Fix reference to native diffutils.
From: |
guix-commits |
Subject: |
01/02: gnu: mg: Fix reference to native diffutils. |
Date: |
Sun, 18 Jul 2021 14:29:21 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 7f2b9306eea163391dda6e4cf395a0e2be1be984
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Jul 18 14:14:27 2021 +0200
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.
---
gnu/packages/text-editors.scm | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 11332fa..2f42d83 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -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"