Revert "openjdk: remove references also in CA-derivations"

This reverts commit a2ff18c06a.
This commit is contained in:
2024-11-26 16:39:43 +01:00
parent 9461321cc1
commit 54ed4a3897

View File

@@ -12,7 +12,6 @@
lndir, lndir,
unzip, unzip,
ensureNewerSourcesForZipFilesHook, ensureNewerSourcesForZipFilesHook,
removeReferencesTo,
cpio, cpio,
file, file,
@@ -232,7 +231,6 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = nativeBuildInputs =
[ [
pkg-config pkg-config
removeReferencesTo
] ]
++ lib.optionals atLeast11 [ ++ lib.optionals atLeast11 [
autoconf autoconf
@@ -565,8 +563,6 @@ stdenv.mkDerivation (finalAttrs: {
mkdir -p $out/nix-support mkdir -p $out/nix-support
#TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
# remove references also in CA-derivations
find "$out" -type f -exec remove-references-to -t ${jdk-bootstrap'} '{}' +
'' ''
else else
'' ''
@@ -575,8 +571,6 @@ stdenv.mkDerivation (finalAttrs: {
# properly. # properly.
mkdir -p $jre/nix-support mkdir -p $jre/nix-support
printWords ${setJavaClassPath} > $jre/nix-support/propagated-build-inputs printWords ${setJavaClassPath} > $jre/nix-support/propagated-build-inputs
# remove references also in CA-derivations
find "$out" -type f -exec remove-references-to -t ${jdk-bootstrap} '{}' +
'' ''
) )
+ '' + ''