nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-27 07:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

openjdk: rename enableGnome2 to enableGtk

Browse Source 
GNOME 2 dependencies were removed in the previous commit.

gtk3 and glib are used to provide GTK look and feel.
glib is also used for proxy settings but it probably does not make much sense
to have a separate option, since disjoint union with GTK-based environments is small.
This commit is contained in:
Jan Tojnar 2024-06-27 09:31:04 +02:00
parent dbd9745e11
commit 0774766ffe
13 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/compilers/openjdk/11.nix
View File

@ -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"
]);

8
pkgs/development/compilers/openjdk/12.nix
View File

@ -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"
];

8
pkgs/development/compilers/openjdk/13.nix
View File

@ -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"
]);

8
pkgs/development/compilers/openjdk/14.nix
View File

@ -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"
]);

8
pkgs/development/compilers/openjdk/15.nix
View File

@ -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"
]);

8
pkgs/development/compilers/openjdk/16.nix
View File

@ -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"
]);

8
pkgs/development/compilers/openjdk/17.nix
View File

@ -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"
]);

8
pkgs/development/compilers/openjdk/18.nix
View File

@ -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"
]);

8
pkgs/development/compilers/openjdk/19.nix
View File

@ -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"
]);

8
pkgs/development/compilers/openjdk/20.nix
View File

@ -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"
]);

8
pkgs/development/compilers/openjdk/21.nix
View File

@ -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"
]);

8
pkgs/development/compilers/openjdk/22.nix
View File

@ -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"
]);

8
pkgs/development/compilers/openjdk/8.nix
View File

@ -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"
]);