diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-06-18 01:19:25 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-18 01:19:25 +0300 |
| commit | 44f784b44de5a709a2ce22e951aa6fa728154b95 (patch) | |
| tree | 9745563343bd026fd2fc318ea9bea965528d3f13 | |
| parent | a0cd8365a8db1dfdc7d2dc1f48ee41091783f2e5 (diff) | |
| parent | 40be2f873490e3f85deb99c6656592c39852db72 (diff) | |
| download | nixpkgs-44f784b44de5a709a2ce22e951aa6fa728154b95.tar nixpkgs-44f784b44de5a709a2ce22e951aa6fa728154b95.tar.gz nixpkgs-44f784b44de5a709a2ce22e951aa6fa728154b95.tar.bz2 nixpkgs-44f784b44de5a709a2ce22e951aa6fa728154b95.tar.lz nixpkgs-44f784b44de5a709a2ce22e951aa6fa728154b95.tar.xz nixpkgs-44f784b44de5a709a2ce22e951aa6fa728154b95.tar.zst nixpkgs-44f784b44de5a709a2ce22e951aa6fa728154b95.zip | |
Merge pull request #238211 from Tillerino/dbeaver-maven-jdk17
dbeaver: use JDK17 for Maven build
| -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 = [ |