about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2016-11-07 16:29:20 +0100
committerVladimír Čunát <vcunat@gmail.com>2016-11-07 18:55:21 +0100
commit996d8ddd9907433b93b13f518abb0a6f36fa248e (patch)
treeeb4e957a88fa78a92c15eb4adca2d6197634b0da /pkgs
parent51feecbe88742dd4496c96981d1a87a12c1022e7 (diff)
downloadnixlib-996d8ddd9907433b93b13f518abb0a6f36fa248e.tar
nixlib-996d8ddd9907433b93b13f518abb0a6f36fa248e.tar.gz
nixlib-996d8ddd9907433b93b13f518abb0a6f36fa248e.tar.bz2
nixlib-996d8ddd9907433b93b13f518abb0a6f36fa248e.tar.lz
nixlib-996d8ddd9907433b93b13f518abb0a6f36fa248e.tar.xz
nixlib-996d8ddd9907433b93b13f518abb0a6f36fa248e.tar.zst
nixlib-996d8ddd9907433b93b13f518abb0a6f36fa248e.zip
vim*: fix :Man a bit
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/editors/vim/common.nix7
-rw-r--r--pkgs/applications/editors/vim/configurable.nix2
-rw-r--r--pkgs/applications/editors/vim/default.nix2
3 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 7ceca4a89024..c91df72f18c7 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 793f554970f3..d0a0c63d9d06 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 cf84609921e5..8c9a725ddd66 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 ];