Unverified Commit b83b0dc7 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #308824 from blitz/virtualbox-wsimport 

virtualbox: unbreak enableWebService
parents 32ca35ad 4832d27a

pkgs/applications/virtualization/virtualbox/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ 
# See https://github.com/cyberus-technology/virtualbox-kvm/issues/12

assert enableKvm -> !enableHardening;



# The web services use Java infrastructure.

assert enableWebService -> javaBindings;



with lib;



let

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -35246,7 +35246,9 @@ with pkgs; 
  virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox {

    stdenv = stdenv_32bit;

    inherit (gnome2) libIDL;

    jdk = openjdk17;













    # VirtualBox uses wsimport, which was removed after JDK 8.













    jdk = jdk8;















  };





























  virtualboxKvm = lowPrio (virtualbox.override {