diff options
| author | SirYwell <hannesgreule@outlook.de> | 2023-08-29 17:34:17 +0200 |
|---|---|---|
| committer | Edward Tjörnhammar <ed@cflags.cc> | 2023-09-19 07:00:33 +0200 |
| commit | b7e68243306833845cbf92e2ea1e0cf782481a51 (patch) | |
| tree | f1c4bd1c71d04c8c5abb72656033793f87c7d95e /pkgs/development/compilers/openjdk/16.nix | |
| parent | 2e705d027f372ecafadabc714fde6f1901d15fdc (diff) | |
| download | nixpkgs-b7e68243306833845cbf92e2ea1e0cf782481a51.tar nixpkgs-b7e68243306833845cbf92e2ea1e0cf782481a51.tar.gz nixpkgs-b7e68243306833845cbf92e2ea1e0cf782481a51.tar.bz2 nixpkgs-b7e68243306833845cbf92e2ea1e0cf782481a51.tar.lz nixpkgs-b7e68243306833845cbf92e2ea1e0cf782481a51.tar.xz nixpkgs-b7e68243306833845cbf92e2ea1e0cf782481a51.tar.zst nixpkgs-b7e68243306833845cbf92e2ea1e0cf782481a51.zip | |
openjdk: remove explicit flag to include ZGC
Since Java 15, ZGC is a default JVM feature and therefore does not need to be enabled explicitly. The platforms it is available on automatically include it, rendering the explicit flag obsolete.
Diffstat (limited to 'pkgs/development/compilers/openjdk/16.nix')
| -rw-r--r-- | pkgs/development/compilers/openjdk/16.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix index 802449e4027..507dff50889 100644 --- a/pkgs/development/compilers/openjdk/16.nix +++ b/pkgs/development/compilers/openjdk/16.nix @@ -81,8 +81,7 @@ let "--with-zlib=system" "--with-lcms=system" "--with-stdc++lib=dynamic" - ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" - ++ lib.optional headless "--enable-headless-only" + ] ++ lib.optional headless "--enable-headless-only" ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; separateDebugInfo = true; |