diff options
Diffstat (limited to 'pkgs/applications/virtualization/virtualbox/default.nix')
| -rw-r--r-- | pkgs/applications/virtualization/virtualbox/default.nix | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 9690ee757c0d5..dd9b99f7f9bc9 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -4,12 +4,12 @@ , qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43 , alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib, xz , yasm, glslang -, linuxPackages , nixosTests # If open-watcom-bin is not passed, VirtualBox will fall back to use # the shipped alternative sources (assembly). , open-watcom-bin , makeself, perl +, vulkan-loader , javaBindings ? true, jdk # Almost doesn't affect closure size , pythonBindings ? false, python3 , extensionPack ? null, fakeroot @@ -32,11 +32,11 @@ let buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. - virtualboxVersion = "7.0.14"; - virtualboxSha256 = "45860d834804a24a163c1bb264a6b1cb802a5bc7ce7e01128072f8d6a4617ca9"; + virtualboxVersion = "7.0.18"; + virtualboxSha256 = "d999513533631674a024762668de999411d8197060c51e68c5faf0a2c0eea1a5"; - kvmPatchVersion = "20240502"; - kvmPatchHash = "sha256-KokIrrAoJutHzPg6e5YAJgDGs+nQoVjapmyn9kG5tV0="; + kvmPatchVersion = "20240515"; + kvmPatchHash = "sha256-Kh/tlPScdf7CbEEpL54iqMpeUIdmnJL2r/mxnlEzLd0="; # The KVM build is not compatible to VirtualBox's kernel modules. So don't export # modsrc at all. @@ -135,8 +135,6 @@ in stdenv.mkDerivation (finalAttrs: { ./qt-dependency-paths.patch # https://github.com/NixOS/nixpkgs/issues/123851 ./fix-audio-driver-loading.patch - ./libxml-2.12.patch - ./gcc-13.patch ]; postPatch = '' @@ -266,7 +264,8 @@ in stdenv.mkDerivation (finalAttrs: { # If hardening is disabled, wrap the VirtualBoxVM binary instead of patching # the source code (see postPatch). + optionalString (!headless && !enableHardening) '' - wrapQtApp $out/libexec/virtualbox/VirtualBoxVM + wrapQtApp $out/libexec/virtualbox/VirtualBoxVM \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ vulkan-loader ]}" ''; passthru = { |