vim: Modernize derivation, hopefully fixing cross

This commit is contained in:
John Ericson 2017-05-31 00:53:47 -04:00 committed by John Ericson
parent 167b80ba76
commit 8b22e497f2

View File

@ -6,7 +6,9 @@
sha256 = "18ifhv5q9prd175q3vxbqf6qyvkk6bc7d2lhqdk0q78i68kv9y0c"; sha256 = "18ifhv5q9prd175q3vxbqf6qyvkk6bc7d2lhqdk0q78i68kv9y0c";
} }
# apple frameworks # apple frameworks
, Carbon, Cocoa }: , Carbon, Cocoa
, buildPlatform, hostPlatform
}:
let let
common = callPackage ./common.nix {}; common = callPackage ./common.nix {};
@ -17,22 +19,13 @@ stdenv.mkDerivation rec {
inherit (common) version src postPatch 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 hostPlatform.isDarwin [ Carbon Cocoa ];
nativeBuildInputs = [ gettext ]; nativeBuildInputs = [ gettext ];
configureFlags = [ configureFlags = [
"--enable-multibyte" "--enable-multibyte"
"--enable-nls" "--enable-nls"
]; ] ++ stdenv.lib.optionals (hostPlatform != buildPlatform) [
postInstall = ''
ln -s $out/bin/vim $out/bin/vi
mkdir -p $out/share/vim
cp "${vimrc}" $out/share/vim/vimrc
'';
crossAttrs = {
configureFlags = [
"vim_cv_toupper_broken=no" "vim_cv_toupper_broken=no"
"--with-tlib=ncurses" "--with-tlib=ncurses"
"vim_cv_terminfo=yes" "vim_cv_terminfo=yes"
@ -43,9 +36,16 @@ stdenv.mkDerivation rec {
"ac_cv_sizeof_int=4" "ac_cv_sizeof_int=4"
"vim_cv_memmove_handles_overlap=yes" "vim_cv_memmove_handles_overlap=yes"
"vim_cv_memmove_handles_overlap=yes" "vim_cv_memmove_handles_overlap=yes"
"STRIP=${stdenv.cross.config}-strip"
# TODO(@Ericson2314): wont' be needed soon.
"STRIP=${hostPlatform.config}-strip"
]; ];
};
postInstall = ''
ln -s $out/bin/vim $out/bin/vi
mkdir -p $out/share/vim
cp "${vimrc}" $out/share/vim/vimrc
'';
__impureHostDeps = [ "/dev/ptmx" ]; __impureHostDeps = [ "/dev/ptmx" ];