diff options
| author | Tillerino <tillmann.gaida@gmail.com> | 2023-06-16 20:07:09 +0200 |
|---|---|---|
| committer | Tillerino <tillmann.gaida@gmail.com> | 2023-06-17 10:13:36 +0200 |
| commit | 40be2f873490e3f85deb99c6656592c39852db72 (patch) | |
| tree | cd97b03cdb517005c23eab228832c377d7f881f9 /pkgs/applications/misc/dbeaver | |
| parent | 8a1e6d18ec0ea33c455c69dc375b202376af959c (diff) | |
| download | nixpkgs-40be2f873490e3f85deb99c6656592c39852db72.tar nixpkgs-40be2f873490e3f85deb99c6656592c39852db72.tar.gz nixpkgs-40be2f873490e3f85deb99c6656592c39852db72.tar.bz2 nixpkgs-40be2f873490e3f85deb99c6656592c39852db72.tar.lz nixpkgs-40be2f873490e3f85deb99c6656592c39852db72.tar.xz nixpkgs-40be2f873490e3f85deb99c6656592c39852db72.tar.zst nixpkgs-40be2f873490e3f85deb99c6656592c39852db72.zip | |
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.
Diffstat (limited to 'pkgs/applications/misc/dbeaver')
| -rw-r--r-- | pkgs/applications/misc/dbeaver/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 07d0534f073..82d8a0f5421 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 = [ |