diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-11-07 16:29:20 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-11-07 18:55:21 +0100 |
commit | 996d8ddd9907433b93b13f518abb0a6f36fa248e (patch) | |
tree | eb4e957a88fa78a92c15eb4adca2d6197634b0da /pkgs/applications/editors/vim | |
parent | 51feecbe88742dd4496c96981d1a87a12c1022e7 (diff) |
vim*: fix :Man a bit
Diffstat (limited to 'pkgs/applications/editors/vim')
-rw-r--r-- | pkgs/applications/editors/vim/common.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/editors/vim/configurable.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/editors/vim/default.nix | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 7ceca4a89024f..c91df72f18c76 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -13,6 +13,13 @@ rec { hardeningDisable = [ "fortify" ]; + postPatch = + # Use man from $PATH; escape sequences are still problematic. + '' + substituteInPlace runtime/ftplugin/man.vim \ + --replace "/usr/bin/man " "man " + ''; + meta = with lib; { description = "The most popular clone of the VI editor"; homepage = http://www.vim.org; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 793f554970f37..d0a0c63d9d06d 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -46,7 +46,7 @@ composableDerivation { name = "vim_configurable-${version}"; - inherit (common) version hardeningDisable enableParallelBuilding meta; + inherit (common) version postPatch hardeningDisable enableParallelBuilding meta; src = builtins.getAttr source { "default" = common.src; # latest release diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index cf84609921e5b..8c9a725ddd665 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { name = "vim-${version}"; - inherit (common) version src hardeningDisable enableParallelBuilding meta; + inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta; buildInputs = [ ncurses pkgconfig ] ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; |