From 5b211b6f4c834fd816eaff8ae7cd43d84b1eb42f Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 28 Jul 2018 00:14:05 +0200 Subject: [PATCH] vim-configurable: fix python support Removed --enable-python since that doesn't seem to do anything. --- pkgs/applications/editors/vim/configurable.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index da15081173d..7a700e0956b 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"