nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-14 00:17:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

dbeaver: use JDK17 for Maven build

Browse Source 
JDK17 was already used to run DBeaver, but the Maven build started
failing recently when the JDK used implicitly by Maven was upgraded.
This commit is contained in:
Tillerino 2023-06-16 20:07:09 +02:00
parent 8a1e6d18ec
commit 40be2f8734
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/misc/dbeaver/default.nix
View File

@ -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 = [