diff options
| author | sternenseemann | 2024-09-27 11:41:25 +0200 |
|---|---|---|
| committer | sternenseemann | 2024-09-27 11:41:25 +0200 |
| commit | b341506a8d18d8d5d47ed4dbb201c8ed04b183d1 (patch) | |
| tree | aa477119c53f4d71f3cfceb0f827b92e1c13351b /pkgs/development/compilers/openjdk/21.nix | |
| parent | b6b063bdc265990fb87781682da974578b16443c (diff) | |
| parent | fdadb5f0df5d2641c7e4494f4defc31f1e9cb8c0 (diff) | |
Merge branch master into haskell-updates
Conflicts from #341407 resolved.
Diffstat (limited to 'pkgs/development/compilers/openjdk/21.nix')
| -rw-r--r-- | pkgs/development/compilers/openjdk/21.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/compilers/openjdk/21.nix b/pkgs/development/compilers/openjdk/21.nix index 9c403fb2755d..7a650fa4a30f 100644 --- a/pkgs/development/compilers/openjdk/21.nix +++ b/pkgs/development/compilers/openjdk/21.nix @@ -98,7 +98,7 @@ let # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859 "--with-extra-cxxflags=-xc++" ] - ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" + ++ lib.optional stdenv.hostPlatform.isx86_64 "--with-jvm-features=zgc" ++ lib.optional headless "--enable-headless-only" ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; |