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

Merge pull request #59497 from samueldr/auto/dbeaver/nixpkgs-unstable/6.0.2

Browse Source 
dbeaver: 5.3.0 -> 6.0.2
This commit is contained in:
Samuel Dionne-Riel 2019-04-14 14:12:47 -04:00 committed by GitHub
commit 0df8ae8bb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeDesktopItem, makeWrapper
, fontconfig, freetype, glib, gtk2
, fontconfig, freetype, glib, gtk3
, jdk, libX11, libXrender, libXtst, zlib }:
# The build process is almost like eclipse's.
@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
name = "dbeaver-ce-${version}";
version = "6.0.0";
version = "6.0.2";
desktopItem = makeDesktopItem {
name = "dbeaver";
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
fontconfig freetype glib gtk2
fontconfig freetype glib gtk3
jdk libX11 libXrender libXtst zlib
];
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
sha256 = "1v7zvvphkyw7x5ziysk4gs2rpgc4dr108fn4ja80kijs1jmj5dxr";
sha256 = "12zqz9zi4jryvlk1rjxfl4jdj4a6n00018yyk95glfdrxda2xyib";
};
installPhase = ''
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \
--prefix PATH : ${jdk}/bin \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ])} \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk3 libXtst ])} \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
# Create desktop item.

4
pkgs/top-level/all-packages.nix
View File

@ -2284,7 +2284,9 @@ in
davfs2 = callPackage ../tools/filesystems/davfs2 { };
dbeaver = callPackage ../applications/misc/dbeaver { };
dbeaver = callPackage ../applications/misc/dbeaver {
jdk = jdk11;
};
dbench = callPackage ../development/tools/misc/dbench { };