From c0674aafc7841fb33157f1f9c37e9ca0b6050ee4 Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Thu, 8 Feb 2024 19:45:03 +0100 Subject: [PATCH 1/2] virtualbox: use less vendored libraries --- pkgs/applications/virtualization/virtualbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 9ccda28cfa73..20fbb3eb4d09 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,8 +1,8 @@ { config, stdenv, fetchurl, lib, acpica-tools, dev86, pam, libxslt, libxml2, wrapQtAppsHook , libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL2, libcap, libGL, libGLU -, libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras +, libpng, glib, lvm2, libXrandr, libXinerama, libopus, libtpms, qtbase, qtx11extras , qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43 -, alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib +, alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib, xz , yasm, glslang , linuxPackages # If open-watcom-bin is not passed, VirtualBox will fall back to use @@ -46,7 +46,7 @@ in stdenv.mkDerivation { buildInputs = [ acpica-tools dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL libcap glib lvm2 alsa-lib curl libvpx pam makeself perl - libXmu libXrandr libpng libopus python3 ] + libXmu libXrandr libpng libopus libtpms python3 xz ] ++ optional javaBindings jdk ++ optional pythonBindings python3 # Python is needed even when not building bindings ++ optional pulseSupport libpulseaudio From 4596cd09eb6dc52f0886be51144275d52337dcb9 Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Thu, 8 Feb 2024 19:45:30 +0100 Subject: [PATCH 2/2] virtualbox: allow adding config flags via overrides This is to prepare building the KVM version [1] as well. For that it will be nice to reuse the existing expressions. [1] https://github.com/cyberus-technology/virtualbox-kvm --- pkgs/applications/virtualization/virtualbox/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 20fbb3eb4d09..ca3d15db0fea 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -17,6 +17,7 @@ , headless ? false , enable32bitGuests ? true , enableWebService ? false +, extraConfigureFlags ? "" }: with lib; @@ -158,6 +159,7 @@ in stdenv.mkDerivation { ${optionalString (!enable32bitGuests) "--disable-vmmraw"} \ ${optionalString enableWebService "--enable-webservice"} \ ${optionalString (open-watcom-bin != null) "--with-ow-dir=${open-watcom-bin}"} \ + ${extraConfigureFlags} \ --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