diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 32251fbd6d32..d4fde704985b 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -5,7 +5,7 @@ , setJavaClassPath , headless ? false , enableJavaFX ? false, openjfx -, enableGnome2 ? true, gtk3, glib +, enableGtk ? true, gtk3, glib }: let @@ -33,7 +33,7 @@ let cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ gtk3 glib ]; @@ -51,7 +51,7 @@ let url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch"; hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; }) - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ ./swing-use-gtk-jdk10.patch ]; @@ -87,7 +87,7 @@ let NIX_LDFLAGS = toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ "-lgtk-3" "-lgio-2.0" ]); diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix index 82f6c219d75a..3f7213ea8ff6 100644 --- a/pkgs/development/compilers/openjdk/12.nix +++ b/pkgs/development/compilers/openjdk/12.nix @@ -5,7 +5,7 @@ , setJavaClassPath , headless ? false , enableJavaFX ? false, openjfx -, enableGnome2 ? true, gtk3, glib +, enableGtk ? true, gtk3, glib }: let @@ -30,7 +30,7 @@ let cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ gtk3 glib ]; @@ -52,7 +52,7 @@ let url = "https://github.com/openjdk/panama-foreign/commit/af5c725b8109ce83fc04ef0f8bf6aaf0b50c0441.patch"; sha256 = "0ja84kih5wkjn58pml53s59qnavb1z92dc88cbgw7vcyqwc1gs0h"; }) - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ ./swing-use-gtk-jdk10.patch ]; @@ -83,7 +83,7 @@ let NIX_LDFLAGS = lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ "-lgtk-3" "-lgio-2.0" ]; diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix index 947e3df4606f..292470256d53 100644 --- a/pkgs/development/compilers/openjdk/13.nix +++ b/pkgs/development/compilers/openjdk/13.nix @@ -5,7 +5,7 @@ , setJavaClassPath , headless ? false , enableJavaFX ? false, openjfx -, enableGnome2 ? true, gtk3, glib +, enableGtk ? true, gtk3, glib }: let @@ -30,7 +30,7 @@ let cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ gtk3 glib ]; @@ -52,7 +52,7 @@ let url = "https://github.com/openjdk/panama-foreign/commit/af5c725b8109ce83fc04ef0f8bf6aaf0b50c0441.patch"; sha256 = "0ja84kih5wkjn58pml53s59qnavb1z92dc88cbgw7vcyqwc1gs0h"; }) - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ ./swing-use-gtk-jdk13.patch ]; @@ -88,7 +88,7 @@ let NIX_LDFLAGS = toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ "-lgtk-3" "-lgio-2.0" ]); diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix index 2588108a6af7..5d540b6fe84f 100644 --- a/pkgs/development/compilers/openjdk/14.nix +++ b/pkgs/development/compilers/openjdk/14.nix @@ -5,7 +5,7 @@ , setJavaClassPath , headless ? false , enableJavaFX ? false, openjfx -, enableGnome2 ? true, gtk3, glib +, enableGtk ? true, gtk3, glib }: let @@ -30,7 +30,7 @@ let cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ gtk3 glib ]; @@ -47,7 +47,7 @@ let url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; }) - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ ./swing-use-gtk-jdk13.patch ]; @@ -83,7 +83,7 @@ let NIX_LDFLAGS = toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ "-lgtk-3" "-lgio-2.0" ]); diff --git a/pkgs/development/compilers/openjdk/15.nix b/pkgs/development/compilers/openjdk/15.nix index d816e2de0913..4fc475edba64 100644 --- a/pkgs/development/compilers/openjdk/15.nix +++ b/pkgs/development/compilers/openjdk/15.nix @@ -5,7 +5,7 @@ , setJavaClassPath , headless ? false , enableJavaFX ? false, openjfx -, enableGnome2 ? true, gtk3, glib +, enableGtk ? true, gtk3, glib }: let @@ -33,7 +33,7 @@ let cpio perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ gtk3 glib ]; @@ -50,7 +50,7 @@ let url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; }) - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ ./swing-use-gtk-jdk13.patch ]; @@ -85,7 +85,7 @@ let NIX_LDFLAGS = toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ "-lgtk-3" "-lgio-2.0" ]); diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix index 32486cef407d..357cbb849aba 100644 --- a/pkgs/development/compilers/openjdk/16.nix +++ b/pkgs/development/compilers/openjdk/16.nix @@ -5,7 +5,7 @@ , setJavaClassPath , headless ? false , enableJavaFX ? false, openjfx -, enableGnome2 ? true, gtk3, glib +, enableGtk ? true, gtk3, glib }: let @@ -35,7 +35,7 @@ let cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ gtk3 glib ]; @@ -53,7 +53,7 @@ let sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; }) ./fix-glibc-2.34.patch - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ ./swing-use-gtk-jdk13.patch ]; @@ -90,7 +90,7 @@ let NIX_LDFLAGS = toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ "-lgtk-3" "-lgio-2.0" ]); diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix index 69ff1b316cd6..09f3518880ef 100644 --- a/pkgs/development/compilers/openjdk/17.nix +++ b/pkgs/development/compilers/openjdk/17.nix @@ -5,7 +5,7 @@ , setJavaClassPath , headless ? false , enableJavaFX ? false, openjfx -, enableGnome2 ? true, gtk3, glib +, enableGtk ? true, gtk3, glib }: let @@ -34,7 +34,7 @@ let cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ gtk3 glib ]; @@ -69,7 +69,7 @@ let url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch"; hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; }) - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ ./swing-use-gtk-jdk13.patch ]; @@ -107,7 +107,7 @@ let NIX_LDFLAGS = toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ "-lgtk-3" "-lgio-2.0" ]); diff --git a/pkgs/development/compilers/openjdk/18.nix b/pkgs/development/compilers/openjdk/18.nix index 0aad5571d7f7..e798317f8aa5 100644 --- a/pkgs/development/compilers/openjdk/18.nix +++ b/pkgs/development/compilers/openjdk/18.nix @@ -5,7 +5,7 @@ , setJavaClassPath , headless ? false , enableJavaFX ? false, openjfx -, enableGnome2 ? true, gtk3, glib +, enableGtk ? true, gtk3, glib }: let @@ -34,7 +34,7 @@ let cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ gtk3 glib ]; @@ -60,7 +60,7 @@ let url = "https://git.alpinelinux.org/aports/plain/testing/openjdk18/FixNullPtrCast.patch?id=b93d1fc37fcf106144958d957bb97c7db67bd41f"; hash = "sha256-nvO8RcmKwMcPdzq28mZ4If1XJ6FQ76CYWqRIozPCk5U="; }) - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ ./swing-use-gtk-jdk13.patch ]; @@ -98,7 +98,7 @@ let NIX_LDFLAGS = toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ "-lgtk-3" "-lgio-2.0" ]); diff --git a/pkgs/development/compilers/openjdk/19.nix b/pkgs/development/compilers/openjdk/19.nix index 459d15d48fe7..dd01d19bcfbd 100644 --- a/pkgs/development/compilers/openjdk/19.nix +++ b/pkgs/development/compilers/openjdk/19.nix @@ -8,7 +8,7 @@ # which should be fixable, this is a no-rebuild workaround for GHC. , headless ? stdenv.targetPlatform.isGhcjs , enableJavaFX ? false, openjfx -, enableGnome2 ? true, gtk3, glib +, enableGtk ? true, gtk3, glib }: let @@ -39,7 +39,7 @@ let cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ gtk3 glib ]; @@ -73,7 +73,7 @@ let url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch"; hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; }) - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ ./swing-use-gtk-jdk13.patch ]; @@ -109,7 +109,7 @@ let NIX_LDFLAGS = toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ "-lgtk-3" "-lgio-2.0" ]); diff --git a/pkgs/development/compilers/openjdk/20.nix b/pkgs/development/compilers/openjdk/20.nix index 8519b3ffb394..9726be71293f 100644 --- a/pkgs/development/compilers/openjdk/20.nix +++ b/pkgs/development/compilers/openjdk/20.nix @@ -8,7 +8,7 @@ # which should be fixable, this is a no-rebuild workaround for GHC. , headless ? stdenv.targetPlatform.isGhcjs , enableJavaFX ? false, openjfx -, enableGnome2 ? true, gtk3, glib +, enableGtk ? true, gtk3, glib }: let @@ -37,7 +37,7 @@ let cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ gtk3 glib ]; @@ -71,7 +71,7 @@ let url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch"; hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; }) - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ ./swing-use-gtk-jdk13.patch ]; @@ -107,7 +107,7 @@ let NIX_LDFLAGS = toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ "-lgtk-3" "-lgio-2.0" ]); diff --git a/pkgs/development/compilers/openjdk/21.nix b/pkgs/development/compilers/openjdk/21.nix index 9db97ca5154f..3e51cedcedfd 100644 --- a/pkgs/development/compilers/openjdk/21.nix +++ b/pkgs/development/compilers/openjdk/21.nix @@ -8,7 +8,7 @@ # which should be fixable, this is a no-rebuild workaround for GHC. , headless ? stdenv.targetPlatform.isGhcjs , enableJavaFX ? false, openjfx -, enableGnome2 ? true, gtk3, glib +, enableGtk ? true, gtk3, glib }: let @@ -37,7 +37,7 @@ let cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ gtk3 glib ]; @@ -64,7 +64,7 @@ let url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch"; hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; }) - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ ./swing-use-gtk-jdk13.patch ]; @@ -101,7 +101,7 @@ let NIX_LDFLAGS = toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ "-lgtk-3" "-lgio-2.0" ]); diff --git a/pkgs/development/compilers/openjdk/22.nix b/pkgs/development/compilers/openjdk/22.nix index bc4a26ca1816..9d682c30be43 100644 --- a/pkgs/development/compilers/openjdk/22.nix +++ b/pkgs/development/compilers/openjdk/22.nix @@ -38,7 +38,7 @@ , headless ? stdenv.targetPlatform.isGhcjs , enableJavaFX ? false , openjfx -, enableGnome2 ? true +, enableGtk ? true , gtk3 , glib , writeShellScript @@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ gtk3 glib ]; @@ -127,7 +127,7 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch"; hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; }) - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ ./swing-use-gtk-jdk13.patch ]; @@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: { "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ "-lgtk-3" "-lgio-2.0" ]); diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 99815a92fbab..8a97c7277f60 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -5,7 +5,7 @@ , openjdk8-bootstrap , setJavaClassPath , headless ? false -, enableGnome2 ? true, gtk2, glib +, enableGtk ? true, gtk2, glib }: let @@ -43,7 +43,7 @@ let cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ gtk2 glib ]; @@ -52,7 +52,7 @@ let ./read-truststore-from-env-jdk8.patch ./currency-date-range-jdk8.patch ./fix-library-path-jdk8.patch - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ ./swing-use-gtk-jdk8.patch ]; @@ -96,7 +96,7 @@ let NIX_LDFLAGS= toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ "-lgtk-x11-2.0" "-lgio-2.0" ]);