diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-03-29 17:36:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-29 17:36:58 +0200 |
| commit | be5f2ee5c7f6b4f350033b9234dce8e3cdaff5b9 (patch) | |
| tree | a2b49ac3c9432caa334ec3d650a85e8ba8fdd201 /pkgs/applications | |
| parent | 76d378c1476ed8ba522858cdf5812bba03199acd (diff) | |
| parent | f4bee462e5d6635df18133b5e600c7a620f88cfd (diff) | |
Merge pull request #117145 from jojosch/dbeaver-21.0.1
dbeaver: 21.0.0 -> 21.0.1
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/misc/dbeaver/default.nix | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 68c9019f6edd6..e65b236a5e257 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, copyDesktopItems , fetchFromGitHub , makeDesktopItem , makeWrapper @@ -14,26 +15,16 @@ , zlib , maven }: -let - desktopItem = makeDesktopItem { - name = "dbeaver"; - exec = "dbeaver"; - icon = "dbeaver"; - desktopName = "dbeaver"; - comment = "SQL Integrated Development Environment"; - genericName = "SQL Integrated Development Environment"; - categories = "Development;"; - }; -in + stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "21.0.0"; # When updating also update fetchedMavenDeps.sha256 + version = "21.0.1"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-it0EcPD7TXSknjVkGv22Nq1D4J32OEncQDy4w9CIPNk="; + sha256 = "sha256-9l8604STqmdoUjD+EJCp4aDk4juKsPCmFnD/WYpajxo="; }; fetchedMavenDeps = stdenv.mkDerivation { @@ -62,6 +53,12 @@ stdenv.mkDerivation rec { outputHash = "sha256-xKlFFQXd2U513KZKQa7ttSFNX2gxVr9hNsvyaoN/rEE="; }; + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + maven + ]; + buildInputs = [ fontconfig freetype @@ -71,12 +68,19 @@ stdenv.mkDerivation rec { libX11 libXrender libXtst - makeWrapper zlib ]; - nativeBuildInputs = [ - maven + desktopItems = [ + (makeDesktopItem { + name = "dbeaver"; + exec = "dbeaver"; + icon = "dbeaver"; + desktopName = "dbeaver"; + comment = "SQL Integrated Development Environment"; + genericName = "SQL Integrated Development Environment"; + categories = "Development;"; + }) ]; buildPhase = '' @@ -89,7 +93,7 @@ stdenv.mkDerivation rec { installPhase = let - productTargetPath = "product/standalone/target/products/org.jkiss.dbeaver.core.product"; + productTargetPath = "product/community/target/products/org.jkiss.dbeaver.core.product"; platformMap = { aarch64-linux = "aarch64"; @@ -129,10 +133,6 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst ])} \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - # Create desktop item. - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications - mkdir -p $out/share/pixmaps ln -s $out/dbeaver/icon.xpm $out/share/pixmaps/dbeaver.xpm |