From c8cbd369eb512b0bc5cc0d5dfc2b5d35da50aa4f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Mar 2021 01:07:24 +0100 Subject: gnu: vim-full: Remove duplicate 'make-flags'. Fixes . Co-authored-by: Tobias Geerinckx-Rice * gnu/packages/vim.scm (vim-full)[arguments]: Remove duplicate 'make-flags'. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/vim.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu/packages/vim.scm') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 372d470e09..d559364d32 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2019 Julien Lepiller ;;; Copyright © 2019, 2020 Jakub Kądziołka ;;; Copyright © 2020 Jack Hill +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -216,11 +217,14 @@ (define-public vim-full "--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 -- cgit v1.2.3