Skip to content

squirrel-sql: Use jdk17 instead of jre #263758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Mr-Andersen wants to merge 1 commit into from
Closed

squirrel-sql: Use jdk17 instead of jre #263758

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkgs/development/tools/database/squirrel-sql/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# To enable specific database drivers, override this derivation and pass the
# driver packages in the drivers argument (e.g. mysql_jdbc, postgresql_jdbc).
{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip
, jre
, jdk17
, drivers ? []
}:
stdenv.mkDerivation rec {
Expand All @@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [ makeWrapper unzip ];
buildInputs = [ jre ];
buildInputs = [ jdk17 ];

unpackPhase = ''
runHook preUnpack
Expand Down Expand Up @@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
done
makeWrapper $out/share/squirrel-sql/squirrel-sql.sh $out/bin/squirrel-sql \
--set CLASSPATH "$cp" \
--set JAVA_HOME "${jre}"
--set JAVA_HOME "${jdk17}"
# Make sure above `CLASSPATH` gets picked up
substituteInPlace $out/share/squirrel-sql/squirrel-sql.sh --replace "-cp \"\$CP\"" "-cp \"\$CLASSPATH:\$CP\""

Expand Down