nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-07 20:53:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #322599 from jtojnar/java-gnome2-drop

Browse Source 
openjdk: remove gnome_vfs & GConf
This commit is contained in:
Sandro 2024-07-03 00:30:11 +02:00 committed by GitHub
commit 7a329a89de
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 78 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@
, setJavaClassPath
, headless ? false
, enableJavaFX ? false, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
, enableGtk ? true, gtk3, glib
}:
let
@ -33,8 +33,8 @@ 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) [
gtk3 gnome_vfs GConf glib
] ++ lib.optionals (!headless && enableGtk) [
gtk3 glib
];
patches = [
@ -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,8 +87,8 @@ let
NIX_LDFLAGS = toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
] ++ lib.optionals (!headless && enableGtk) [
"-lgtk-3" "-lgio-2.0"
]);
# -j flag is explicitly rejected by the build system:

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

@ -5,7 +5,7 @@
, setJavaClassPath
, headless ? false
, enableJavaFX ? false, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
, enableGtk ? true, gtk3, glib
}:
let
@ -30,8 +30,8 @@ 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) [
gtk3 gnome_vfs GConf glib
] ++ lib.optionals (!headless && enableGtk) [
gtk3 glib
];
patches = [
@ -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,8 +83,8 @@ let
NIX_LDFLAGS = lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
] ++ lib.optionals (!headless && enableGtk) [
"-lgtk-3" "-lgio-2.0"
];
# -j flag is explicitly rejected by the build system:

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

@ -5,7 +5,7 @@
, setJavaClassPath
, headless ? false
, enableJavaFX ? false, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
, enableGtk ? true, gtk3, glib
}:
let
@ -30,8 +30,8 @@ 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) [
gtk3 gnome_vfs GConf glib
] ++ lib.optionals (!headless && enableGtk) [
gtk3 glib
];
patches = [
@ -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,8 +88,8 @@ let
NIX_LDFLAGS = toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
] ++ lib.optionals (!headless && enableGtk) [
"-lgtk-3" "-lgio-2.0"
]);
# -j flag is explicitly rejected by the build system:

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

@ -5,7 +5,7 @@
, setJavaClassPath
, headless ? false
, enableJavaFX ? false, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
, enableGtk ? true, gtk3, glib
}:
let
@ -30,8 +30,8 @@ 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) [
gtk3 gnome_vfs GConf glib
] ++ lib.optionals (!headless && enableGtk) [
gtk3 glib
];
patches = [
@ -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,8 +83,8 @@ let
NIX_LDFLAGS = toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
] ++ lib.optionals (!headless && enableGtk) [
"-lgtk-3" "-lgio-2.0"
]);
# -j flag is explicitly rejected by the build system:

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

@ -5,7 +5,7 @@
, setJavaClassPath
, headless ? false
, enableJavaFX ? false, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
, enableGtk ? true, gtk3, glib
}:
let
@ -33,8 +33,8 @@ 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) [
gtk3 gnome_vfs GConf glib
] ++ lib.optionals (!headless && enableGtk) [
gtk3 glib
];
patches = [
@ -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,8 +85,8 @@ let
NIX_LDFLAGS = toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
] ++ lib.optionals (!headless && enableGtk) [
"-lgtk-3" "-lgio-2.0"
]);
# -j flag is explicitly rejected by the build system:

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

@ -5,7 +5,7 @@
, setJavaClassPath
, headless ? false
, enableJavaFX ? false, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
, enableGtk ? true, gtk3, glib
}:
let
@ -35,8 +35,8 @@ 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) [
gtk3 gnome_vfs GConf glib
] ++ lib.optionals (!headless && enableGtk) [
gtk3 glib
];
patches = [
@ -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,8 +90,8 @@ let
NIX_LDFLAGS = toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
] ++ lib.optionals (!headless && enableGtk) [
"-lgtk-3" "-lgio-2.0"
]);
# -j flag is explicitly rejected by the build system:

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

@ -5,7 +5,7 @@
, setJavaClassPath
, headless ? false
, enableJavaFX ? false, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
, enableGtk ? true, gtk3, glib
}:
let
@ -34,8 +34,8 @@ 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) [
gtk3 gnome_vfs GConf glib
] ++ lib.optionals (!headless && enableGtk) [
gtk3 glib
];
patches = [
@ -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,8 +107,8 @@ let
NIX_LDFLAGS = toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
] ++ lib.optionals (!headless && enableGtk) [
"-lgtk-3" "-lgio-2.0"
]);
# -j flag is explicitly rejected by the build system:

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

@ -5,7 +5,7 @@
, setJavaClassPath
, headless ? false
, enableJavaFX ? false, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
, enableGtk ? true, gtk3, glib
}:
let
@ -34,8 +34,8 @@ 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) [
gtk3 gnome_vfs GConf glib
] ++ lib.optionals (!headless && enableGtk) [
gtk3 glib
];
patches = [
@ -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,8 +98,8 @@ let
NIX_LDFLAGS = toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
] ++ lib.optionals (!headless && enableGtk) [
"-lgtk-3" "-lgio-2.0"
]);
# -j flag is explicitly rejected by the build system:

12
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, gnome_vfs, glib, GConf
, enableGtk ? true, gtk3, glib
}:
let
@ -39,8 +39,8 @@ 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) [
gtk3 gnome_vfs GConf glib
] ++ lib.optionals (!headless && enableGtk) [
gtk3 glib
];
patches = [
@ -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,8 +109,8 @@ let
NIX_LDFLAGS = toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
] ++ lib.optionals (!headless && enableGtk) [
"-lgtk-3" "-lgio-2.0"
]);
# -j flag is explicitly rejected by the build system:

12
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, gnome_vfs, glib, GConf
, enableGtk ? true, gtk3, glib
}:
let
@ -37,8 +37,8 @@ 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) [
gtk3 gnome_vfs GConf glib
] ++ lib.optionals (!headless && enableGtk) [
gtk3 glib
];
patches = [
@ -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,8 +107,8 @@ let
NIX_LDFLAGS = toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
] ++ lib.optionals (!headless && enableGtk) [
"-lgtk-3" "-lgio-2.0"
]);
# -j flag is explicitly rejected by the build system:

12
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, gnome_vfs, glib, GConf
, enableGtk ? true, gtk3, glib
}:
let
@ -37,8 +37,8 @@ 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) [
gtk3 gnome_vfs GConf glib
] ++ lib.optionals (!headless && enableGtk) [
gtk3 glib
];
patches = [
@ -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,8 +101,8 @@ let
NIX_LDFLAGS = toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
] ++ lib.optionals (!headless && enableGtk) [
"-lgtk-3" "-lgio-2.0"
]);
# -j flag is explicitly rejected by the build system:

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

@ -38,11 +38,9 @@
, headless ? stdenv.targetPlatform.isGhcjs
, enableJavaFX ? false
, openjfx
, enableGnome2 ? true
, enableGtk ? true
, gtk3
, gnome_vfs
, glib
, GConf
, writeShellScript
}:
@ -101,10 +99,8 @@ stdenv.mkDerivation (finalAttrs: {
libXrandr
fontconfig
openjdk-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
] ++ lib.optionals (!headless && enableGtk) [
gtk3
gnome_vfs
GConf
glib
];
@ -131,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
];
@ -173,11 +169,9 @@ stdenv.mkDerivation (finalAttrs: {
"-lXinerama"
"-lXrandr"
"-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
] ++ lib.optionals (!headless && enableGtk) [
"-lgtk-3"
"-lgio-2.0"
"-lgnomevfs-2"
"-lgconf-2"
]);
# -j flag is explicitly rejected by the build system:

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

@ -5,7 +5,7 @@
, openjdk8-bootstrap
, setJavaClassPath
, headless ? false
, enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf
, enableGtk ? true, gtk2, glib
}:
let
@ -43,8 +43,8 @@ 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) [
gtk2 gnome_vfs GConf glib
] ++ lib.optionals (!headless && enableGtk) [
gtk2 glib
];
patches = [
@ -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,8 +96,8 @@ let
NIX_LDFLAGS= toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
] ++ lib.optionals (!headless && enableGtk) [
"-lgtk-x11-2.0" "-lgio-2.0"
]);
# -j flag is explicitly rejected by the build system:

8
pkgs/top-level/java-packages.nix
View File

@ -16,11 +16,7 @@ in {
compiler = let
gnomeArgs = {
inherit (gnome2) GConf gnome_vfs;
};
bootstrapArgs = gnomeArgs // {
bootstrapArgs = {
openjfx = openjfx11; /* need this despite next line :-( */
enableJavaFX = false;
headless = true;
@ -62,7 +58,7 @@ in {
in openjdk // { headless = openjdk; };
mkOpenjdkLinuxOnly = path-linux: args: let
openjdk = callPackage path-linux (gnomeArgs // args);
openjdk = callPackage path-linux (args);
in assert stdenv.isLinux; openjdk // {
headless = openjdk.override { headless = true; };
};