BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8125 from KaiSforza/vim-python3

Browse source 
vim_configurable: change python version detection
This commit is contained in:
Arseniy Seroka 2016-01-07 00:46:01 +03:00
commit 9d30688c40
1 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -108,26 +108,14 @@ composableDerivation {
// edf { // edf {
name = "python"; name = "python";
feat = "pythoninterp"; feat = "python${if python ? isPy3 then "3" else ""}interp";
enable = { enable = {
nativeBuildInputs = [ python ]; nativeBuildInputs = [ python ];
} // lib.optionalAttrs stdenv.isDarwin { } // lib.optionalAttrs stdenv.isDarwin {
configureFlags configureFlags
= [ "--enable-pythoninterp=yes" = [ "--enable-python${if python ? isPy3 then "3" else ""}interp=yes"
"--with-python-config-dir=${python}/lib" ]; "--with-python${if python ? isPy3 then "3" else ""}-config-dir=${python}/lib"
}; "--disable-python${if python ? isPy3 then "" else "3"}interp" ];
}
// edf {
name = "python3";
feat = "python3interp";
enable = {
nativeBuildInputs = [ pkgs.python3 ];
} // lib.optionalAttrs stdenv.isDarwin {
configureFlags
= [ "--enable-python3interp=yes"
"--with-python3-config-dir=${pkgs.python3}/lib"
"--disable-pythoninterp" ];
}; };
} }
@ -160,7 +148,6 @@ composableDerivation {
cfg = { cfg = {
luaSupport = config.vim.lua or true; luaSupport = config.vim.lua or true;
pythonSupport = config.vim.python or true; pythonSupport = config.vim.python or true;
python3Support = config.vim.python3 or false;
rubySupport = config.vim.ruby or true; rubySupport = config.vim.ruby or true;
nlsSupport = config.vim.nls or false; nlsSupport = config.vim.nls or false;
tclSupport = config.vim.tcl or false; tclSupport = config.vim.tcl or false;