git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #117145 from jojosch/dbeaver-21.0.1

dbeaver: 21.0.0 -> 21.0.1

commitbe5f2ee5c7f6b4f350033b9234dce8e3cdaff5b9 authorSandro <sandro.jaeckel@gmail.com> dateMon 29 Mar 2021, 17:36 (6 years ago) parent76d378cf4bee46
1 file changed+21−21
pkgs/applications/misc/dbeaver/default.nix+21−21
pkgs/applications/misc/dbeaver/default.nix+21−21
@@ -1,5 +1,6 @@
11{ lib
22, stdenv
3+, copyDesktopItems
34, fetchFromGitHub
45, makeDesktopItem
56, makeWrapper
@@ -14,26 +15,16 @@
1415, zlib
1516, maven
1617}:
17−let
18− desktopItem = makeDesktopItem {
19− name = "dbeaver";
20− exec = "dbeaver";
21− icon = "dbeaver";
22− desktopName = "dbeaver";
23− comment = "SQL Integrated Development Environment";
24− genericName = "SQL Integrated Development Environment";
25− categories = "Development;";
26− };
27−in
18+
2819stdenv.mkDerivation rec {
2920 pname = "dbeaver-ce";
30− version = "21.0.0"; # When updating also update fetchedMavenDeps.sha256
21+ version = "21.0.1"; # When updating also update fetchedMavenDeps.sha256
3122
3223 src = fetchFromGitHub {
3324 owner = "dbeaver";
3425 repo = "dbeaver";
3526 rev = version;
36− sha256 = "sha256-it0EcPD7TXSknjVkGv22Nq1D4J32OEncQDy4w9CIPNk=";
27+ sha256 = "sha256-9l8604STqmdoUjD+EJCp4aDk4juKsPCmFnD/WYpajxo=";
3728 };
3829
3930 fetchedMavenDeps = stdenv.mkDerivation {
@@ -62,6 +53,12 @@ stdenv.mkDerivation rec {
6253 outputHash = "sha256-xKlFFQXd2U513KZKQa7ttSFNX2gxVr9hNsvyaoN/rEE=";
6354 };
6455
56+ nativeBuildInputs = [
57+ copyDesktopItems
58+ makeWrapper
59+ maven
60+ ];
61+
6562 buildInputs = [
6663 fontconfig
6764 freetype
@@ -71,12 +68,19 @@ stdenv.mkDerivation rec {
7168 libX11
7269 libXrender
7370 libXtst
74− makeWrapper
7571 zlib
7672 ];
7773
78− nativeBuildInputs = [
79− maven
74+ desktopItems = [
75+ (makeDesktopItem {
76+ name = "dbeaver";
77+ exec = "dbeaver";
78+ icon = "dbeaver";
79+ desktopName = "dbeaver";
80+ comment = "SQL Integrated Development Environment";
81+ genericName = "SQL Integrated Development Environment";
82+ categories = "Development;";
83+ })
8084 ];
8185
8286 buildPhase = ''
@@ -89,7 +93,7 @@ stdenv.mkDerivation rec {
8993
9094 installPhase =
9195 let
92− productTargetPath = "product/standalone/target/products/org.jkiss.dbeaver.core.product";
96+ productTargetPath = "product/community/target/products/org.jkiss.dbeaver.core.product";
9397
9498 platformMap = {
9599 aarch64-linux = "aarch64";
@@ -129,10 +133,6 @@ stdenv.mkDerivation rec {
129133 --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst ])} \
130134 --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
131135
132− # Create desktop item.
133− mkdir -p $out/share/applications
134− cp ${desktopItem}/share/applications/* $out/share/applications
135−
136136 mkdir -p $out/share/pixmaps
137137 ln -s $out/dbeaver/icon.xpm $out/share/pixmaps/dbeaver.xpm
138138