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

virtualbox: 5.2.14 -> 5.2.22

Browse Source 
I had to drop xorriso because it didn't seem to want to compile with it
any more, and had to add libopus as a build input because it wouldn't
compile without that.
This commit is contained in:
Alyssa Ross 2018-12-07 16:04:49 +00:00
parent 74d0b82f29
commit d41661cea7
No known key found for this signature in database
GPG Key ID: C4844408C0657052
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,9 @@
{ stdenv, fetchurl, lib, fetchpatch, iasl, dev86, pam, libxslt, libxml2 { stdenv, fetchurl, lib, fetchpatch, iasl, dev86, pam, libxslt, libxml2
, libX11, xproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap , 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 , pkgconfig, which, docbook_xsl, docbook_xml_dtd_43
, alsaLib, curl, libvpx, nettools, dbus , alsaLib, curl, libvpx, nettools, dbus
, xorriso, makeself, perl , makeself, perl
, javaBindings ? false, jdk ? null , javaBindings ? false, jdk ? null
, pythonBindings ? false, python2 ? null , pythonBindings ? false, python2 ? null
, extensionPack ? null, fakeroot ? null , extensionPack ? null, fakeroot ? null
@ -20,8 +20,8 @@ let
python = python2; python = python2;
buildType = "release"; buildType = "release";
# Remember to change the extpackRev and version in extpack.nix as well. # Remember to change the extpackRev and version in extpack.nix as well.
main = "ee3af129a581ec4c1a3e777e98247f8943e976ce6edd24962bcaa5c53ed1f644"; main = "1m48ywa913g6zgqslvrihxs2fbr4gmljypbdpjma2hck6isyi02m";
version = "5.2.14"; version = "5.2.22";
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "virtualbox-${version}"; name = "virtualbox-${version}";
@ -36,8 +36,8 @@ 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 alsaLib curl libvpx pam xorriso makeself perl libcap glib lvm2 alsaLib curl libvpx pam makeself perl
libXmu libpng python ] libXmu libpng libopus python ]
++ optional javaBindings jdk ++ optional javaBindings jdk
++ optional pythonBindings python # Python is needed even when not building bindings ++ optional pythonBindings python # Python is needed even when not building bindings
++ optional pulseSupport libpulseaudio ++ optional pulseSupport libpulseaudio
@ -122,7 +122,7 @@ in stdenv.mkDerivation {
${optionalString (!pulseSupport) "--disable-pulse"} \ ${optionalString (!pulseSupport) "--disable-pulse"} \
${optionalString (!enableHardening) "--disable-hardening"} \ ${optionalString (!enableHardening) "--disable-hardening"} \
${optionalString (!enable32bitGuests) "--disable-vmmraw"} \ ${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@' \ sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib.dev}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \
-i AutoConfig.kmk -i AutoConfig.kmk
sed -e 's@arch/x86/@@' \ sed -e 's@arch/x86/@@' \