Merge pull request #40920 from Ma27/vim-configurable-python-override
vim_configurable: restore ability to override python for modules
This commit is contained in:
commit
3010d99648
|
@ -5,10 +5,13 @@ args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, ge
|
|||
, libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
|
||||
, libICE
|
||||
, vimPlugins
|
||||
, makeWrapper
|
||||
|
||||
# apple frameworks
|
||||
, CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private
|
||||
|
||||
, wrapPythonDrv ? false
|
||||
|
||||
, ... }: with args;
|
||||
|
||||
|
||||
|
@ -106,6 +109,11 @@ composableDerivation {
|
|||
feat = "python${if python ? isPy3 then "3" else ""}interp";
|
||||
enable = {
|
||||
buildInputs = [ python ];
|
||||
} // lib.optionalAttrs wrapPythonDrv {
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/vim" --prefix PATH : "${python}/bin"
|
||||
'';
|
||||
} // lib.optionalAttrs stdenv.isDarwin {
|
||||
configureFlags
|
||||
= [ "--enable-python${if python ? isPy3 then "3" else ""}interp=yes"
|
||||
|
|
Loading…
Reference in a new issue