From 40be2f873490e3f85deb99c6656592c39852db72 Mon Sep 17 00:00:00 2001
From: Tillerino <tillmann.gaida@gmail.com>
Date: Fri, 16 Jun 2023 20:07:09 +0200
Subject: [PATCH] dbeaver: use JDK17 for Maven build

JDK17 was already used to run DBeaver, but the Maven build started
failing recently when the JDK used implicitly by Maven was upgraded.
---
 pkgs/applications/misc/dbeaver/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index 07d0534f0734..82d8a0f54216 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -19,8 +19,12 @@
 , javaPackages
 }:
 
-(javaPackages.mavenfod.override {
-  inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix)
+let mavenJdk17 = maven.override {
+  jdk = jdk17;
+};
+
+in (javaPackages.mavenfod.override {
+  maven = mavenJdk17; # use overridden maven version (see dbeaver's entry in all-packages.nix)
 }) rec {
   pname = "dbeaver";
   version = "22.2.2"; # When updating also update mvnSha256
@@ -32,13 +36,13 @@
     sha256 = "sha256-TUdtrhQ1JzqZx+QNauNA1P/+WDSSeOGIgGX3SdS0JTI=";
   };
 
-  mvnSha256 = "uu7UNRIuAx2GOh4+YxxoGRcV5QO8C72q32e0ynJdgFo=";
+  mvnSha256 = "87pf7XRXCuZlAbL54pX+a5Lo/874DmUr/W37/V+5YpQ=";
   mvnParameters = "-P desktop,all-platforms";
 
   nativeBuildInputs = [
     copyDesktopItems
     makeWrapper
-    maven
+    mavenJdk17
   ];
 
   buildInputs = [