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

vim*: fix :Man a bit

Browse Source
This commit is contained in:
Vladimír Čunát 2016-11-07 16:29:20 +01:00
parent 51feecbe88
commit 996d8ddd99
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/editors/vim/common.nix
View File

@ -13,6 +13,13 @@ rec {
hardeningDisable = [ "fortify" ]; 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; { meta = with lib; {
description = "The most popular clone of the VI editor"; description = "The most popular clone of the VI editor";
homepage = http://www.vim.org; homepage = http://www.vim.org;

2
pkgs/applications/editors/vim/configurable.nix
View File

@ -46,7 +46,7 @@ composableDerivation {
name = "vim_configurable-${version}"; name = "vim_configurable-${version}";
inherit (common) version hardeningDisable enableParallelBuilding meta; inherit (common) version postPatch hardeningDisable enableParallelBuilding meta;
src = builtins.getAttr source { src = builtins.getAttr source {
"default" = common.src; # latest release "default" = common.src; # latest release

2
pkgs/applications/editors/vim/default.nix
View File

@ -14,7 +14,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "vim-${version}"; name = "vim-${version}";
inherit (common) version src hardeningDisable enableParallelBuilding meta; inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta;
buildInputs = [ ncurses pkgconfig ] buildInputs = [ ncurses pkgconfig ]
++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ];