public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #40920 from Ma27/vim-configurable-python-override

Browse Source 
vim_configurable: restore ability to override python for modules
This commit is contained in:
Daiderd Jordan 2018-05-30 20:58:49 +02:00 committed by GitHub
commit 3010d99648
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/editors/vim/configurable.nix
View File

@ -5,10 +5,13 @@ args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, ge
, libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
, libICE , libICE
, vimPlugins , vimPlugins
, makeWrapper
# apple frameworks # apple frameworks
, CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private , CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private
, wrapPythonDrv ? false
, ... }: with args; , ... }: with args;
@ -106,6 +109,11 @@ composableDerivation {
feat = "python${if python ? isPy3 then "3" else ""}interp"; feat = "python${if python ? isPy3 then "3" else ""}interp";
enable = { enable = {
buildInputs = [ python ]; buildInputs = [ python ];
} // lib.optionalAttrs wrapPythonDrv {
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
wrapProgram "$out/bin/vim" --prefix PATH : "${python}/bin"
'';
} // lib.optionalAttrs stdenv.isDarwin { } // lib.optionalAttrs stdenv.isDarwin {
configureFlags configureFlags
= [ "--enable-python${if python ? isPy3 then "3" else ""}interp=yes" = [ "--enable-python${if python ? isPy3 then "3" else ""}interp=yes"