diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-05 00:02:56 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-05 00:02:56 +0000 |
commit | 0c98bf3e85e5aa8137d9a7ae40468a3db53f0cdd (patch) | |
tree | 20ba2747ee022ad1afd33ec39052d4f9f8b54b42 /pkgs/development/compilers/openjdk | |
parent | ccb3146bf27b954399648f7d12c3af8efeab1f13 (diff) | |
parent | 817103a9a31549202114a542a6a626cc058dc407 (diff) | |
download | nixlib-0c98bf3e85e5aa8137d9a7ae40468a3db53f0cdd.tar nixlib-0c98bf3e85e5aa8137d9a7ae40468a3db53f0cdd.tar.gz nixlib-0c98bf3e85e5aa8137d9a7ae40468a3db53f0cdd.tar.bz2 nixlib-0c98bf3e85e5aa8137d9a7ae40468a3db53f0cdd.tar.lz nixlib-0c98bf3e85e5aa8137d9a7ae40468a3db53f0cdd.tar.xz nixlib-0c98bf3e85e5aa8137d9a7ae40468a3db53f0cdd.tar.zst nixlib-0c98bf3e85e5aa8137d9a7ae40468a3db53f0cdd.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/compilers/openjdk')
-rw-r--r-- | pkgs/development/compilers/openjdk/19.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/compilers/openjdk/19.nix b/pkgs/development/compilers/openjdk/19.nix index 1af3c920b2c6..717bfedcb635 100644 --- a/pkgs/development/compilers/openjdk/19.nix +++ b/pkgs/development/compilers/openjdk/19.nix @@ -4,7 +4,9 @@ , libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk19-bootstrap , ensureNewerSourcesForZipFilesHook , setJavaClassPath -, headless ? false +# TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages +# which should be fixable, this is a no-rebuild workaround for GHC. +, headless ? stdenv.targetPlatform.isGhcjs , enableJavaFX ? openjfx.meta.available, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: |