mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00
Code Issues Wiki Activity

vim_configurable: add patches to 7.4.23 (close #912)

Browse source
This commit is contained in:
Jason \"Don\" O'Conal 2013-09-04 11:32:06 +10:00 committed by Vladimír Čunát
parent 4736e6d509
commit 2eb384b982
2 changed files with 42 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
pkgs/applications/editors/vim/configurable.nix
View file

@ -11,7 +11,7 @@ composableDerivation {
else stdenv ).mkDerivation; else stdenv ).mkDerivation;
} (fix: { } (fix: {
name = "vim_configurable-7.4"; name = "vim_configurable-7.4.23";
enableParallelBuilding = true; # test this enableParallelBuilding = true; # test this
@ -38,8 +38,10 @@ composableDerivation {
preConfigure preConfigure
= stdenv.lib.optionalString = stdenv.lib.optionalString
(stdenv.isDarwin && (config.vim.darwin or true)) '' (stdenv.isDarwin && (config.vim.darwin or true)) ''
sed -i "5387,5390d" src/auto/configure # TODO: we should find a better way of doing this as, if the configure
sed -i "5394d" src/auto/configure # file changes, we need to change these line numbers
sed -i "5641,5644d" src/auto/configure
sed -i "5648d" src/auto/configure
''; '';
configureFlags configureFlags
@ -49,10 +51,26 @@ composableDerivation {
= [ ncurses pkgconfig gtk libX11 libXext libSM libXpm libXt libXaw libXau = [ ncurses pkgconfig gtk libX11 libXext libSM libXpm libXt libXaw libXau
libXmu glib libICE ]; libXmu glib libICE ];
prePatch = "cd src";
patches =
[ ./patches/7.4.001 ./patches/7.4.002 ./patches/7.4.003 ./patches/7.4.004
./patches/7.4.005 ./patches/7.4.006 ./patches/7.4.007 ./patches/7.4.008
./patches/7.4.009 ./patches/7.4.010 ./patches/7.4.011 ./patches/7.4.012
./patches/7.4.013 ./patches/7.4.014 ./patches/7.4.015 ./patches/7.4.016
./patches/7.4.017 ./patches/7.4.018 ./patches/7.4.019 ./patches/7.4.020
./patches/7.4.021 ./patches/7.4.022 ./patches/7.4.023 ];
# most interpreters aren't tested yet.. (see python for example how to do it) # most interpreters aren't tested yet.. (see python for example how to do it)
flags = { flags = {
ftNix = { ftNix = {
patches = [ ./ft-nix-support.patch ]; # because we cd to src in the main patch phase, we can't just add this
# patch to the list, we have to apply it manually
postPatch = ''
cd ../runtime
patch -p2 < ${./ft-nix-support.patch}
cd ..
'';
}; };
} }
// edf { name = "darwin"; } #Disable Darwin (Mac OS X) support. // edf { name = "darwin"; } #Disable Darwin (Mac OS X) support.
@ -131,10 +149,11 @@ composableDerivation {
dontStrip = 1; dontStrip = 1;
meta = { meta = with stdenv.lib; {
description = "The most popular clone of the VI editor"; description = "The most popular clone of the VI editor";
homepage = "www.vim.org"; homepage = http://www.vim.org;
platforms = lib.platforms.unix; maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
}; };
}) })

21
pkgs/applications/editors/vim/default.nix
View file

@ -1,10 +1,11 @@
{ stdenv, fetchurl, ncurses, gettext, pkgconfig }: { stdenv, fetchurl, ncurses, gettext, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "vim-7.4"; patchLevel = "23";
name = "vim-7.4.${patchLevel}";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.vim.org/pub/vim/unix/${name}.tar.bz2"; url = "ftp://ftp.vim.org/pub/vim/unix/${name}.tar.bz2";
sha256 = "1pjaffap91l2rb9pjnlbrpvb3ay5yhhr3g91zabjvw1rqk9adxfh"; sha256 = "1pjaffap91l2rb9pjnlbrpvb3ay5yhhr3g91zabjvw1rqk9adxfh";
}; };
@ -39,10 +40,20 @@ stdenv.mkDerivation rec {
# To fix the trouble in vim73, that it cannot cross-build with this patch # To fix the trouble in vim73, that it cannot cross-build with this patch
# to bypass a configure script check that cannot be done cross-building. # to bypass a configure script check that cannot be done cross-building.
# http://groups.google.com/group/vim_dev/browse_thread/thread/66c02efd1523554b?pli=1 # http://groups.google.com/group/vim_dev/browse_thread/thread/66c02efd1523554b?pli=1
patchPhase = '' # patchPhase = ''
sed -i -e 's/as_fn_error.*int32.*/:/' src/auto/configure # sed -i -e 's/as_fn_error.*int32.*/:/' src/auto/configure
''; # '';
prePatch = "cd src";
patches =
[ ./patches/7.4.001 ./patches/7.4.002 ./patches/7.4.003 ./patches/7.4.004
./patches/7.4.005 ./patches/7.4.006 ./patches/7.4.007 ./patches/7.4.008
./patches/7.4.009 ./patches/7.4.010 ./patches/7.4.011 ./patches/7.4.012
./patches/7.4.013 ./patches/7.4.014 ./patches/7.4.015 ./patches/7.4.016
./patches/7.4.017 ./patches/7.4.018 ./patches/7.4.019 ./patches/7.4.020
./patches/7.4.021 ./patches/7.4.022 ./patches/7.4.023 ];
meta = with stdenv.lib; { meta = with stdenv.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;