nckx pushed a commit to branch master
in repository guix.
commit c8cbd369eb512b0bc5cc0d5dfc2b5d35da50aa4f
Author: Tobias Geerinckx-Rice <[email protected]>
AuthorDate: Sat Mar 6 01:07:24 2021 +0100
gnu: vim-full: Remove duplicate 'make-flags'.
Fixes <https://bugs.gnu.org/46580>.
Co-authored-by: Tobias Geerinckx-Rice <[email protected]>
* gnu/packages/vim.scm (vim-full)[arguments]: Remove duplicate
'make-flags'.
Signed-off-by: Tobias Geerinckx-Rice <[email protected]>
---
gnu/packages/vim.scm | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 372d470..d559364 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2019 Julien Lepiller <[email protected]>
;;; Copyright © 2019, 2020 Jakub Kądziołka <[email protected]>
;;; Copyright © 2020 Jack Hill <[email protected]>
+;;; Copyright © 2021 Simon Tournier <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -216,11 +217,14 @@ with the editor vim.")))
"--enable-xim"
"--disable-selinux"
"--enable-gui")
- ;; This flag fixes the following error:
- ;; .../libpython3.7m.a(pyexpat.o): undefined reference to symbol
'XML_FreeContentModel'
- ;; .../libexpat.so.1: error adding symbols: DSO missing from command
line
- #:make-flags '("LDFLAGS=-lexpat")
,@(substitute-keyword-arguments (package-arguments vim)
+ ;; This flag fixes the following error:
+ ;; .../libpython3.7m.a(pyexpat.o): undefined reference to symbol
'XML_FreeContentModel'
+ ;; .../libexpat.so.1: error adding symbols: DSO missing from
command line
+ ((#:make-flags flags)
+ `(append
+ (list "LDFLAGS=-lexpat")
+ (delete "CFLAGS=-D_REENTRANT" ,flags)))
((#:phases phases)
`(modify-phases ,phases
(add-before 'check 'start-xserver
