[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: mg: Set PKG_CONFIG instead of substituting.
From: |
guix-commits |
Subject: |
02/02: gnu: mg: Set PKG_CONFIG instead of substituting. |
Date: |
Sun, 18 Jul 2021 14:29:21 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 5d2e3b6b23584113b1ccf17130689a3a3562bb6c
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Jul 18 14:16:45 2021 +0200
gnu: mg: Set PKG_CONFIG instead of substituting.
* gnu/packages/text-editors.scm (mg)[arguments]: Add PKG_CONFIG
to #:make-flags, and remove the custom
'pkg-config-for-cross-compiling-target phase.
---
gnu/packages/text-editors.scm | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 2f42d83..5a2c7bc 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -532,7 +532,8 @@ Wordstar-, EMACS-, Pico, Nedit or vi-like key bindings. e3
can be used on
;; 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-diff
@@ -541,13 +542,6 @@ Wordstar-, EMACS-, Pico, Nedit or vi-like key bindings.
e3 can be used on
(("/usr/bin/diff")
(string-append (assoc-ref inputs "diffutils")
"/bin/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"))))))
(add-before 'install 'patch-tutorial-location
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "mg.1"