ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-15 13:37:21 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'u/vimrc' of git://github.com/wizeman/nixpkgs

Browse Source 
vimHugeX: also add wrapper for system-wide vimrc
This commit is contained in:
Shea Levy 2014-03-19 18:07:04 -04:00
commit a1fff61e4d
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,10 +2,12 @@
let let
vimrcfile = writeText "vimrc" (if vimrc == null then "" else vimrc); vimrcfile = writeText "vimrc" vimrc;
p = builtins.parseDrvName vim.name;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "vimwrapper-${vim.version}"; name = "${p.name}-with-vimrc-${p.version}";
buildInputs = [ makeWrapper vim vimrcfile ]; buildInputs = [ makeWrapper vim vimrcfile ];

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

@ -9130,13 +9130,12 @@ let
else stdenv; else stdenv;
}; };
vimwrapper = callPackage ../applications/editors/vim/wrapper.nix { vimWrapper = wrapVim vim;
inherit vim;
vimrc = config.vim.vimrc or null;
};
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;
@ -9169,6 +9168,11 @@ 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 {};
virtmanager = callPackage ../applications/virtualization/virt-manager { virtmanager = callPackage ../applications/virtualization/virt-manager {
inherit (gnome) gnome_python; inherit (gnome) gnome_python;