colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dbeaver: 21.0.0 -> 21.0.1

Browse Source
This commit is contained in:
Johannes Schleifenbaum 2021-03-21 22:31:11 +01:00
parent 7a6d0468bf
commit f4bee462e5
No known key found for this signature in database
GPG Key ID: 059093B1A278BCD0
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
{ lib { lib
, stdenv , stdenv
, copyDesktopItems
, fetchFromGitHub , fetchFromGitHub
, makeDesktopItem , makeDesktopItem
, makeWrapper , makeWrapper
@ -14,26 +15,16 @@
, zlib , zlib
, maven , 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 { stdenv.mkDerivation rec {
pname = "dbeaver-ce"; 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 { src = fetchFromGitHub {
owner = "dbeaver"; owner = "dbeaver";
repo = "dbeaver"; repo = "dbeaver";
rev = version; rev = version;
sha256 = "sha256-it0EcPD7TXSknjVkGv22Nq1D4J32OEncQDy4w9CIPNk="; sha256 = "sha256-9l8604STqmdoUjD+EJCp4aDk4juKsPCmFnD/WYpajxo=";
}; };
fetchedMavenDeps = stdenv.mkDerivation { fetchedMavenDeps = stdenv.mkDerivation {
@ -62,6 +53,12 @@ stdenv.mkDerivation rec {
outputHash = "sha256-xKlFFQXd2U513KZKQa7ttSFNX2gxVr9hNsvyaoN/rEE="; outputHash = "sha256-xKlFFQXd2U513KZKQa7ttSFNX2gxVr9hNsvyaoN/rEE=";
}; };
nativeBuildInputs = [
copyDesktopItems
makeWrapper
maven
];
buildInputs = [ buildInputs = [
fontconfig fontconfig
freetype freetype
@ -71,12 +68,19 @@ stdenv.mkDerivation rec {
libX11 libX11
libXrender libXrender
libXtst libXtst
makeWrapper
zlib zlib
]; ];
nativeBuildInputs = [ desktopItems = [
maven (makeDesktopItem {
name = "dbeaver";
exec = "dbeaver";
icon = "dbeaver";
desktopName = "dbeaver";
comment = "SQL Integrated Development Environment";
genericName = "SQL Integrated Development Environment";
categories = "Development;";
})
]; ];
buildPhase = '' buildPhase = ''
@ -89,7 +93,7 @@ stdenv.mkDerivation rec {
installPhase = installPhase =
let let
productTargetPath = "product/standalone/target/products/org.jkiss.dbeaver.core.product"; productTargetPath = "product/community/target/products/org.jkiss.dbeaver.core.product";
platformMap = { platformMap = {
aarch64-linux = "aarch64"; aarch64-linux = "aarch64";
@ -129,10 +133,6 @@ stdenv.mkDerivation rec {
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst ])} \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst ])} \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --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 mkdir -p $out/share/pixmaps
ln -s $out/dbeaver/icon.xpm $out/share/pixmaps/dbeaver.xpm ln -s $out/dbeaver/icon.xpm $out/share/pixmaps/dbeaver.xpm