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

Merge pull request #308824 from blitz/virtualbox-wsimport

Browse Source 
virtualbox: unbreak enableWebService
This commit is contained in:
Pol Dellaiera 2024-05-12 21:27:39 +02:00 committed by GitHub
commit b83b0dc7f9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

4
pkgs/top-level/all-packages.nix
View File

@ -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 {