diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-07-28 14:42:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-28 14:42:11 +0200 |
| commit | 13c693ed95d13297be4a53e2877a7b44f49eb619 (patch) | |
| tree | a13fce8e7c378c0724d76d5932143b9947c753b8 | |
| parent | 782342cf301a4e4fd6a840c37a8826af9344f818 (diff) | |
| parent | 5b211b6f4c834fd816eaff8ae7cd43d84b1eb42f (diff) | |
| download | nixlib-13c693ed95d13297be4a53e2877a7b44f49eb619.tar nixlib-13c693ed95d13297be4a53e2877a7b44f49eb619.tar.gz nixlib-13c693ed95d13297be4a53e2877a7b44f49eb619.tar.bz2 nixlib-13c693ed95d13297be4a53e2877a7b44f49eb619.tar.lz nixlib-13c693ed95d13297be4a53e2877a7b44f49eb619.tar.xz nixlib-13c693ed95d13297be4a53e2877a7b44f49eb619.tar.zst nixlib-13c693ed95d13297be4a53e2877a7b44f49eb619.zip | |
Merge pull request #44167 from LnL7/vim-configurable-python
vim-configurable: fix python support
| -rw-r--r-- | pkgs/applications/editors/vim/configurable.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index da15081173da..7a700e0956b8 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -112,12 +112,9 @@ in stdenv.mkDerivation rec { "--enable-luainterp" ] ++ stdenv.lib.optionals pythonSupport [ - "--enable-python${if isPython3 then "3" else ""}" - ] - ++ stdenv.lib.optionals (pythonSupport && stdenv.isDarwin) [ # Why only for Darwin? - "--enable-python${if isPython3 then "3" else ""}interp=yes" # Duplicate? + "--enable-python${if isPython3 then "3" else ""}interp=yes" "--with-python${if isPython3 then "3" else ""}-config-dir=${python}/lib" - "--disable-python${if isPython3 then "" else "3"}interp" + "--disable-python${if (!isPython3) then "3" else ""}interp" ] ++ stdenv.lib.optional nlsSupport "--enable-nls" ++ stdenv.lib.optional perlSupport "--enable-perlinterp" |