diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-05-30 20:58:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-30 20:58:49 +0200 |
| commit | 3010d99648aa169cd8a1075b4387337d93ebf867 (patch) | |
| tree | 03235a95fce8cb23402d4cfaa5054a3ca9a62cad /pkgs/applications/editors | |
| parent | 6bced693052c0f305dc290155865a5ce1e8bb201 (diff) | |
| parent | f43446c9ca382e8d50901b409080171a2087f630 (diff) | |
| download | nixlib-3010d99648aa169cd8a1075b4387337d93ebf867.tar nixlib-3010d99648aa169cd8a1075b4387337d93ebf867.tar.gz nixlib-3010d99648aa169cd8a1075b4387337d93ebf867.tar.bz2 nixlib-3010d99648aa169cd8a1075b4387337d93ebf867.tar.lz nixlib-3010d99648aa169cd8a1075b4387337d93ebf867.tar.xz nixlib-3010d99648aa169cd8a1075b4387337d93ebf867.tar.zst nixlib-3010d99648aa169cd8a1075b4387337d93ebf867.zip | |
Merge pull request #40920 from Ma27/vim-configurable-python-override
vim_configurable: restore ability to override python for modules
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/vim/configurable.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 9ffa31f2f2e0..ad04cab62f51 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -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" |