jre, temurin-bin: fix eval in pkgsCross.ghcjs.buildPackages
Since #200337 gobject-introspection propagates itself via depsTargetTargetPropagated, so one doesn't have to add it to every derivation twice. The problem is that gobject-introspection still is in a lot of buildInputs and will thus propagate itself again for target, breaking evaluation unnecessarily if gobject-introspection doesn't evaluate on whatever the target platform turns out to be. temurin-bin and openjdk19 caused such a situation via gtk3 which GHC's JavaScript backend depends on. To fix evaluation of those packages in pkgsCross.ghcjs.buildPackages, we'll just disable the features pulling in gtk3 until this is fixed properly.
This commit is contained in:
parent
de8e0bfaa7
commit
b711b52d15
2 changed files with 6 additions and 2 deletions
|
@ -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
|
||||
}:
|
||||
|
|
|
@ -20,7 +20,9 @@
|
|||
# runtime dependencies
|
||||
, cups
|
||||
# runtime dependencies for GTK+ Look and Feel
|
||||
, gtkSupport ? true
|
||||
# TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages
|
||||
# which should be fixable, this is a no-rebuild workaround for GHC.
|
||||
, gtkSupport ? !stdenv.targetPlatform.isGhcjs
|
||||
, cairo
|
||||
, glib
|
||||
, gtk3
|
||||
|
|
Loading…
Reference in a new issue