Skip to content

Commit 92680ee

Browse files
committed
nix: Do not reduce the size of the JDK
This is a remnant of building the docker container using Nix and was used to reduce the size of the docker container. For our current usage, this only increases complexity, brittleness and reduces maintainability.
1 parent a54b459 commit 92680ee

1 file changed

Lines changed: 1 addition & 5 deletions

File tree

default.nix

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,6 @@ pkgs.stdenvNoCC.mkDerivation rec {
9393
# build-time and run-time dependencies.
9494
outputs = ["out" "maven"];
9595

96-
jre-minimal = pkgs.callPackage (import "${sources.nixpkgs}/pkgs/development/compilers/openjdk/jre.nix") {
97-
modules = ["java.base" "java.desktop"];
98-
};
99-
10096
buildPhase = ''
10197
runHook preBuild
10298
@@ -136,7 +132,7 @@ pkgs.stdenvNoCC.mkDerivation rec {
136132
install -Dm644 "target/diffdetective-${version}.jar" "$out/share/java/DiffDetective.jar"
137133
local jar="$out/share/java/DiffDetective/DiffDetective-jar-with-dependencies.jar"
138134
install -Dm644 "target/diffdetective-${version}-jar-with-dependencies.jar" "$jar"
139-
makeWrapper "${jre-minimal}/bin/java" "$out/bin/DiffDetective" --add-flags "-cp \"$jar\"" \
135+
makeWrapper "${pkgs.jdk}/bin/java" "$out/bin/DiffDetective" --add-flags "-cp \"$jar\"" \
140136
--prefix PATH : "${pkgs.graphviz}/bin"
141137
142138
# install documentation in "$out"

0 commit comments

Comments
 (0)