diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index 1a931b2b10c3f..ad51bea4bdca4 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-LKX8yNSLs60546ZcvLlQF3e++VxHmPsczui4cfrpia0="; }; + patches = [ + ./fix-launcher-version-check.patch + ]; + nativeBuildInputs = [ makeWrapper unzip ]; buildInputs = [ jre ]; diff --git a/pkgs/development/tools/database/squirrel-sql/fix-launcher-version-check.patch b/pkgs/development/tools/database/squirrel-sql/fix-launcher-version-check.patch new file mode 100644 index 0000000000000..52ba790acbafb --- /dev/null +++ b/pkgs/development/tools/database/squirrel-sql/fix-launcher-version-check.patch @@ -0,0 +1,27 @@ +Squirrel SQL 4.5.1 adds support for JDK 19, but the launcher scripts need to be +updated to allow it. + +diff -ru a/squirrelsql-4.5.1-standard/squirrel-sql.bat b/squirrelsql-4.5.1-standard/squirrel-sql.bat +--- a/squirrelsql-4.5.1-standard/squirrel-sql.bat 2022-11-13 01:40:04.000000000 -0800 ++++ b/squirrelsql-4.5.1-standard/squirrel-sql.bat 2023-05-30 17:32:22.825494660 -0700 +@@ -23,7 +23,7 @@ + if NOT "%removed%"=="\" goto strip + set SQUIRREL_SQL_HOME=%basedir% + +-"%LOCAL_JAVA%" -cp "%SQUIRREL_SQL_HOME%\lib\versioncheck.jar" JavaVersionChecker 11 12 13 14 15 16 17 ++"%LOCAL_JAVA%" -cp "%SQUIRREL_SQL_HOME%\lib\versioncheck.jar" JavaVersionChecker 11 12 13 14 15 16 17 18 19 + if ErrorLevel 1 goto ExitForWrongJavaVersion + + :launchsquirrel +diff -ru a/squirrelsql-4.5.1-standard/squirrel-sql.sh b/squirrelsql-4.5.1-standard/squirrel-sql.sh +--- a/squirrelsql-4.5.1-standard/squirrel-sql.sh 2022-11-13 01:40:04.000000000 -0800 ++++ b/squirrelsql-4.5.1-standard/squirrel-sql.sh 2023-05-30 17:29:27.487981752 -0700 +@@ -45,7 +45,7 @@ + # should be able to be run by that version or higher. The arguments to JavaVersionChecker below specify the + # minimum acceptable version (first arg) and any other acceptable subsequent versions. . should + # be all that is necessary for the version form. +-$JAVACMD -cp "$UNIX_STYLE_HOME/lib/versioncheck.jar" JavaVersionChecker 11 12 13 14 15 16 17 ++$JAVACMD -cp "$UNIX_STYLE_HOME/lib/versioncheck.jar" JavaVersionChecker 11 12 13 14 15 16 17 18 19 + if [ "$?" != "0" ]; then + exit + fi