diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 72b2131764d..66a9872b06d 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, lib, fetchpatch, iasl, dev86, pam, libxslt, libxml2 , libX11, xproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap -, libpng, glib, lvm2, libXrandr, libXinerama +, libpng, glib, lvm2, libXrandr, libXinerama, libopus , pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 , alsaLib, curl, libvpx, nettools, dbus -, xorriso, makeself, perl +, makeself, perl , javaBindings ? false, jdk ? null , pythonBindings ? false, python2 ? null , extensionPack ? null, fakeroot ? null @@ -20,8 +20,8 @@ let python = python2; buildType = "release"; # Remember to change the extpackRev and version in extpack.nix as well. - main = "ee3af129a581ec4c1a3e777e98247f8943e976ce6edd24962bcaa5c53ed1f644"; - version = "5.2.14"; + main = "1m48ywa913g6zgqslvrihxs2fbr4gmljypbdpjma2hck6isyi02m"; + version = "5.2.22"; in stdenv.mkDerivation { name = "virtualbox-${version}"; @@ -36,8 +36,8 @@ in stdenv.mkDerivation { buildInputs = [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor libIDL - libcap glib lvm2 alsaLib curl libvpx pam xorriso makeself perl - libXmu libpng python ] + libcap glib lvm2 alsaLib curl libvpx pam makeself perl + libXmu libpng libopus python ] ++ optional javaBindings jdk ++ optional pythonBindings python # Python is needed even when not building bindings ++ optional pulseSupport libpulseaudio @@ -122,7 +122,7 @@ in stdenv.mkDerivation { ${optionalString (!pulseSupport) "--disable-pulse"} \ ${optionalString (!enableHardening) "--disable-hardening"} \ ${optionalString (!enable32bitGuests) "--disable-vmmraw"} \ - --disable-kmods --with-mkisofs=${xorriso}/bin/xorrisofs + --disable-kmods sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib.dev}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \ -i AutoConfig.kmk sed -e 's@arch/x86/@@' \ diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index bd7a0c0f099..703bf813686 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -2,13 +2,12 @@ with lib; -let extpackRev = "123301"; - version = "5.2.14"; +let version = "5.2.22"; in fetchurl rec { - name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${toString extpackRev}.vbox-extpack"; - url = "http://download.virtualbox.org/virtualbox/${version}/${name}"; - sha256 = "d90c1b0c89de19010f7c7fe7a675ac744067baf29a9966b034e97b5b2053b37e"; + name = "Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack"; + url = "https://download.virtualbox.org/virtualbox/${version}/${name}"; + sha256 = "1vria59m7xr521hp2sakfihv8282xcfd5hl6dr1gbcjicmk514kp"; meta = { description = "Oracle Extension pack for VirtualBox";