diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-11-07 15:45:48 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-11-07 18:55:21 +0100 |
| commit | 51feecbe88742dd4496c96981d1a87a12c1022e7 (patch) | |
| tree | a66ca974693fecf5604247b84300f92bcbf9bf6c /pkgs/applications/editors/vim/cflags-prune.diff | |
| parent | 1667046505070067884668e0f2b96aab4c193165 (diff) | |
| download | nixlib-51feecbe88742dd4496c96981d1a87a12c1022e7.tar nixlib-51feecbe88742dd4496c96981d1a87a12c1022e7.tar.gz nixlib-51feecbe88742dd4496c96981d1a87a12c1022e7.tar.bz2 nixlib-51feecbe88742dd4496c96981d1a87a12c1022e7.tar.lz nixlib-51feecbe88742dd4496c96981d1a87a12c1022e7.tar.xz nixlib-51feecbe88742dd4496c96981d1a87a12c1022e7.tar.zst nixlib-51feecbe88742dd4496c96981d1a87a12c1022e7.zip | |
vim_configurable: misc improvements
- fix wrongly used *native* build inputs; - remove confusing `prePatch = "cd src";` ; - adapt RPATH handling to multiple-output changes; - don't list full compiler flags in vim --version, as that would keep references to -dev paths. Together, the closure of the default feature-set drops almost by 100 MB. The lean vim attribute would *not* lose any references due to patching --version, so we only apply it for vim_configurable.
Diffstat (limited to 'pkgs/applications/editors/vim/cflags-prune.diff')
| -rw-r--r-- | pkgs/applications/editors/vim/cflags-prune.diff | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/applications/editors/vim/cflags-prune.diff b/pkgs/applications/editors/vim/cflags-prune.diff new file mode 100644 index 000000000000..6bec4fec09ef --- /dev/null +++ b/pkgs/applications/editors/vim/cflags-prune.diff @@ -0,0 +1,15 @@ +diff --git a/src/Makefile b/src/Makefile +index 864f54b..fd85f76 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -2806,8 +2806,8 @@ auto/pathdef.c: Makefile auto/config.mk + -@echo '#include "vim.h"' >> $@ + -@echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' | $(QUOTESED) >> $@ + -@echo 'char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)";' | $(QUOTESED) >> $@ +- -@echo 'char_u *all_cflags = (char_u *)"$(CC) -c -I$(srcdir) $(ALL_CFLAGS)";' | $(QUOTESED) >> $@ +- -@echo 'char_u *all_lflags = (char_u *)"$(CC) $(ALL_LIB_DIRS) $(LDFLAGS) -o $(VIMTARGET) $(ALL_LIBS) ";' | $(QUOTESED) >> $@ ++ -@echo 'char_u *all_cflags = (char_u *)"see nix-store --read-log $(out)";' | $(QUOTESED) >> $@ ++ -@echo 'char_u *all_lflags = (char_u *)"see nix-store --read-log $(out)";' | $(QUOTESED) >> $@ + -@echo 'char_u *compiled_user = (char_u *)"' | tr -d $(NL) >> $@ + -@if test -n "$(COMPILEDBY)"; then \ + echo "$(COMPILEDBY)" | tr -d $(NL) >> $@; \ |