Merge pull request #238211 from Tillerino/dbeaver-maven-jdk17

dbeaver: use JDK17 for Maven build
This commit is contained in:
Weijia Wang
2023-06-18 01:19:25 +03:00
committed by GitHub
+8 -4
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 = [