tribes/guix
1
0
Fork 1
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-09 02:35:54 +02:00
Code Activity

gnu: vim-full: Don't overwrite configure flags.

Browse Source 
* gnu/packages/vim.scm (vim-full)[arguments]: Adjust the inherited
configure-flags instead of prepending configure-flags to the inherited
arguments.

Fixes: guix/guix#8116
Change-Id: I522b03620ffe6668876843b30bb90f44e521484d
This commit is contained in:
Efraim Flashner
2026-04-27 08:54:42 +03:00
parent 0c1d342191
commit c2b3c7a00b
1 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gnu/packages/vim.scm
+33 -33
View File
@@ -232,39 +232,39 @@ with the editor vim.")))
(inherit vim)
(name "vim-full")
(arguments
(cons*
#:configure-flags
#~(list (string-append "--with-lua-prefix="
#$(this-package-input "lua"))
"--with-features=huge"
"--enable-python3interp=yes"
"--enable-perlinterp=yes"
"--enable-rubyinterp=yes"
"--enable-tclinterp=yes"
"--enable-luainterp=yes"
"--enable-cscope"
"--enable-sniff"
"--enable-multibyte"
"--enable-xim"
"--disable-selinux"
"--enable-gui")
(substitute-keyword-arguments arguments
((#:phases phases)
#~(modify-phases #$phases
(add-before 'check 'skip-some-more-tests
(lambda _
;; Fontconfig can't figure out its cache directory.
(substitute* "src/testdir/test_startup.vim"
((".*Test_progname.*" line)
(string-append line "return\n")))))
;; Some tests require an X server, but do not start one.
(add-before 'check 'start-xserver
(lambda _
(setenv "DISPLAY" ":1")
(zero? (system #$(file-append
(this-package-native-input
"xorg-server")
"/bin/Xvfb :1 &"))))))))))
(substitute-keyword-arguments arguments
((#:configure-flags flags #~'())
#~(cons* (string-append "--with-lua-prefix="
#$(this-package-input "lua"))
"--with-features=huge"
"--enable-python3interp=yes"
"--enable-perlinterp=yes"
"--enable-rubyinterp=yes"
"--enable-tclinterp=yes"
"--enable-luainterp=yes"
"--enable-cscope"
"--enable-sniff"
"--enable-multibyte"
"--enable-xim"
"--disable-selinux"
"--enable-gui"
#$flags))
((#:phases phases)
#~(modify-phases #$phases
(add-before 'check 'skip-some-more-tests
(lambda _
;; Fontconfig can't figure out its cache directory.
(substitute* "src/testdir/test_startup.vim"
((".*Test_progname.*" line)
(string-append line "return\n")))))
;; Some tests require an X server, but do not start one.
(add-before 'check 'start-xserver
(lambda _
(setenv "DISPLAY" ":1")
(zero? (system #$(file-append
(this-package-native-input
"xorg-server")
"/bin/Xvfb :1 &")))))))))
(native-inputs
(modify-inputs native-inputs
(prepend pkg-config xorg-server-for-tests)))