about summary refs log tree commit diff
path: root/pkgs/applications/editors
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2014-03-19 18:07:04 -0400
committerShea Levy <shea@shealevy.com>2014-03-19 18:07:04 -0400
commita1fff61e4d3fb2add468dad267a6ae7aab72b50d (patch)
tree0b22a30f1ee627d92916df1664aeacb0abd51bf1 /pkgs/applications/editors
parent78029b7b0fd29e9ae5026316480453b0fe07f11a (diff)
parent05a2b88df70228fbedcfadc2467933e71f901376 (diff)
downloadnixlib-a1fff61e4d3fb2add468dad267a6ae7aab72b50d.tar
nixlib-a1fff61e4d3fb2add468dad267a6ae7aab72b50d.tar.gz
nixlib-a1fff61e4d3fb2add468dad267a6ae7aab72b50d.tar.bz2
nixlib-a1fff61e4d3fb2add468dad267a6ae7aab72b50d.tar.lz
nixlib-a1fff61e4d3fb2add468dad267a6ae7aab72b50d.tar.xz
nixlib-a1fff61e4d3fb2add468dad267a6ae7aab72b50d.tar.zst
nixlib-a1fff61e4d3fb2add468dad267a6ae7aab72b50d.zip
Merge branch 'u/vimrc' of git://github.com/wizeman/nixpkgs
vimHugeX: also add wrapper for system-wide vimrc
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r--pkgs/applications/editors/vim/wrapper.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/editors/vim/wrapper.nix b/pkgs/applications/editors/vim/wrapper.nix
index 709753ff8eb5..72e868050537 100644
--- a/pkgs/applications/editors/vim/wrapper.nix
+++ b/pkgs/applications/editors/vim/wrapper.nix
@@ -2,10 +2,12 @@
 
 let
 
-  vimrcfile = writeText "vimrc" (if vimrc == null then "" else vimrc);
+  vimrcfile = writeText "vimrc" vimrc;
+
+  p = builtins.parseDrvName vim.name;
 
 in stdenv.mkDerivation rec {
-  name = "vimwrapper-${vim.version}";
+  name = "${p.name}-with-vimrc-${p.version}";
 
   buildInputs = [ makeWrapper vim vimrcfile ];