public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove wrapVim

Browse Source 
I don't see a reason for having wrapVim function and vimWrapper and
vimHugeXWrapper packages. If you need a system vimrc, whats wrong with
``environment.etc."vimrc".text`` ?

Also strictly speaking ``vimHugeXWrapper`` didn't wrap, X-version
properly. I.e. running ``gvim`` have console vim version.
This commit is contained in:
Paul Colomiets 2014-06-29 02:16:19 +03:00 committed by Bjørn Forsman
parent 8d9ff87c14
commit abf19df497
2 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/applications/editors/vim/wrapper.nix
View File

@ -1,32 +0,0 @@
{ stdenv, makeWrapper, writeText, vim, vimrc }:
let
vimrcfile = writeText "vimrc" vimrc;
p = builtins.parseDrvName vim.name;
in stdenv.mkDerivation rec {
name = "${p.name}-with-vimrc-${p.version}";
buildInputs = [ makeWrapper vim vimrcfile ];
phases = [ "installPhase" ];
installPhase = ''
mkdir -p $out
cp -r ${vim}/* $out/
chmod u+w $out/bin
chmod u+w $out/share/vim
ln -s ${vimrcfile} $out/share/vim/vimrc
wrapProgram $out/bin/vim --set VIM "$out/share/vim"
'';
meta = with stdenv.lib; {
description = "The most popular clone of the VI editor";
homepage = http://www.vim.org;
platforms = platforms.unix;
};
}

9
pkgs/top-level/all-packages.nix
View File

@ -9830,12 +9830,8 @@ let
macvim = callPackage ../applications/editors/vim/macvim.nix { }; macvim = callPackage ../applications/editors/vim/macvim.nix { };
vimWrapper = wrapVim vim;
vimHugeX = vim_configurable; vimHugeX = vim_configurable;
vimHugeXWrapper = wrapVim vimHugeX;
vim_configurable = callPackage ../applications/editors/vim/configurable.nix { vim_configurable = callPackage ../applications/editors/vim/configurable.nix {
inherit (pkgs) fetchurl fetchhg stdenv ncurses pkgconfig gettext inherit (pkgs) fetchurl fetchhg stdenv ncurses pkgconfig gettext
composableDerivation lib config glib gtk python perl tcl ruby; composableDerivation lib config glib gtk python perl tcl ruby;
@ -9868,11 +9864,6 @@ let
flags = [ "python" "X11" ]; # only flag "X11" by now flags = [ "python" "X11" ]; # only flag "X11" by now
}); });
wrapVim = vim: import ../applications/editors/vim/wrapper.nix {
inherit stdenv makeWrapper writeText vim;
vimrc = config.vim.vimrc or "";
};
virtviewer = callPackage ../applications/virtualization/virt-viewer { virtviewer = callPackage ../applications/virtualization/virt-viewer {
gtkvnc = gtkvnc.override { enableGTK3 = true; }; gtkvnc = gtkvnc.override { enableGTK3 = true; };
spice_gtk = spice_gtk.override { enableGTK3 = true; }; spice_gtk = spice_gtk.override { enableGTK3 = true; };