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

virtualbox: use python2

Browse Source 
and remove python buildInput. Python should only be added when
`pythonBindings` is true.
This commit is contained in:
Frederik Rietdijk 2016-10-22 17:02:59 +02:00
parent cd351e25aa
commit 95c54db397
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/virtualization/virtualbox/default.nix
View File

@ -4,7 +4,7 @@
, which, alsaLib, curl, libvpx, gawk, nettools, dbus , which, alsaLib, curl, libvpx, gawk, nettools, dbus
, xorriso, makeself, perl, pkgconfig , xorriso, makeself, perl, pkgconfig
, javaBindings ? false, jdk ? null , javaBindings ? false, jdk ? null
, pythonBindings ? false, python ? null , pythonBindings ? false, python2 ? null
, enableExtensionPack ? false, requireFile ? null, patchelf ? null, fakeroot ? null , enableExtensionPack ? false, requireFile ? null, patchelf ? null, fakeroot ? null
, pulseSupport ? false, libpulseaudio ? null , pulseSupport ? false, libpulseaudio ? null
, enableHardening ? false , enableHardening ? false
@ -15,6 +15,7 @@
with stdenv.lib; with stdenv.lib;
let let
python = python2;
buildType = "release"; buildType = "release";
inherit (importJSON ./upstream-info.json) version extpackRev extpack main; inherit (importJSON ./upstream-info.json) version extpackRev extpack main;
@ -48,7 +49,7 @@ in stdenv.mkDerivation {
buildInputs = buildInputs =
[ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor libIDL [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor libIDL
libcap glib lvm2 python alsaLib curl libvpx pam xorriso makeself perl libcap glib lvm2 alsaLib curl libvpx pam xorriso makeself perl
pkgconfig which libXmu libpng patchelfUnstable ] pkgconfig which libXmu libpng patchelfUnstable ]
++ optional javaBindings jdk ++ optional javaBindings jdk
++ optional pythonBindings python ++ optional pythonBindings python