From 95c54db3977e7b2526d5864a59e8153bba5612db Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 22 Oct 2016 17:02:59 +0200 Subject: [PATCH] virtualbox: use python2 and remove python buildInput. Python should only be added when `pythonBindings` is true. --- pkgs/applications/virtualization/virtualbox/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 64275448651c..9e51fd0abe20 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -4,7 +4,7 @@ , which, alsaLib, curl, libvpx, gawk, nettools, dbus , xorriso, makeself, perl, pkgconfig , javaBindings ? false, jdk ? null -, pythonBindings ? false, python ? null +, pythonBindings ? false, python2 ? null , enableExtensionPack ? false, requireFile ? null, patchelf ? null, fakeroot ? null , pulseSupport ? false, libpulseaudio ? null , enableHardening ? false @@ -15,6 +15,7 @@ with stdenv.lib; let + python = python2; buildType = "release"; inherit (importJSON ./upstream-info.json) version extpackRev extpack main; @@ -48,7 +49,7 @@ in stdenv.mkDerivation { buildInputs = [ 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 ] ++ optional javaBindings jdk ++ optional pythonBindings python