diff options
| -rw-r--r-- | pkgs/applications/misc/dbeaver/default.nix | 35 |
1 files changed, 5 insertions, 30 deletions
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index d713afc96a3fe..bcb6f87ab1d33 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -19,9 +19,11 @@ , javaPackages }: -javaPackages.mavenfod rec { +(javaPackages.mavenfod.override { + inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix) +}) rec { pname = "dbeaver"; - version = "22.0.1"; # When updating also update fetchedMavenDeps.sha256 + version = "22.0.1"; # When updating also update mvnSha256 src = fetchFromGitHub { owner = "dbeaver"; @@ -30,36 +32,9 @@ javaPackages.mavenfod rec { sha256 = "sha256-IG5YWwq3WVzQBvAslQ9Z2Ou6ADzf4n9NkQCtH4Jgkac="; }; - - mvnSha256 = "7Sm1hAoi5xc4MLONOD8ySLLkpao0qmlMRRva/8zR210="; + mvnSha256 = "WAB15d4UvUOkBXT7K/hvAZWOE3V1Lpl/tr+AFNBM4FI="; mvnParameters = "-P desktop,all-platforms"; - fetchedMavenDeps = stdenv.mkDerivation { - name = "dbeaver-${version}-maven-deps"; - inherit src; - - buildInputs = [ - maven - ]; - - buildPhase = "mvn package -Dmaven.repo.local=$out/.m2 ${mvnParameters}"; - - # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside - installPhase = '' - find $out -type f \ - -name \*.lastUpdated -or \ - -name resolver-status.properties -or \ - -name _remote.repositories \ - -delete - ''; - - # don't do any fixup - dontFixup = true; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-WAB15d4UvUOkBXT7K/hvAZWOE3V1Lpl/tr+AFNBM4FI="; - }; - nativeBuildInputs = [ copyDesktopItems makeWrapper |