Merge master into staging-next

2021-01-15 06:40:38 +00:00
parent 9f69dadafd 5fae0b941a
commit 83c50873f5
16 changed files with 170 additions and 24 deletions
--- a/pkgs/development/compilers/openjdk/14.nix
+++ b/pkgs/development/compilers/openjdk/14.nix
@@ -55,6 +55,7 @@ let

    configureFlags = [
      "--with-boot-jdk=${openjdk14-bootstrap.home}"
+      "--with-version-pre="
      "--enable-unlimited-crypto"
      "--with-native-debug-symbols=internal"
      "--with-libjpeg=system"
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -55,6 +55,7 @@ let

    configureFlags = [
      "--with-boot-jdk=${openjdk15-bootstrap.home}"
+      "--with-version-pre="
      "--enable-unlimited-crypto"
      "--with-native-debug-symbols=internal"
      "--with-libjpeg=system"