git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #59497 from samueldr/auto/dbeaver/nixpkgs-unstable/6.0.2

dbeaver: 5.3.0 -> 6.0.2

commit0df8ae8bb7043291321d628a8342fe3ee16ec068 authorSamuel Dionne-Riel <samuel@dionne-riel.com> dateSun 14 Apr 2019, 14:12 (8 years ago) parent78a07666a6d6cd
2 files changed+8−6
pkgs/applications/misc/dbeaver/default.nix+5−5 pkgs/top-level/all-packages.nix+3−1
pkgs/applications/misc/dbeaver/default.nix+5−5
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, makeDesktopItem, makeWrapper
2−, fontconfig, freetype, glib, gtk2
2+, fontconfig, freetype, glib, gtk3
33, jdk, libX11, libXrender, libXtst, zlib }:
44
55# The build process is almost like eclipse's.
@@ -7,7 +7,7 @@
77
88stdenv.mkDerivation rec {
99 name = "dbeaver-ce-${version}";
10− version = "6.0.0";
10+ version = "6.0.2";
1111
1212 desktopItem = makeDesktopItem {
1313 name = "dbeaver";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 };
2121
2222 buildInputs = [
23− fontconfig freetype glib gtk2
23+ fontconfig freetype glib gtk3
2424 jdk libX11 libXrender libXtst zlib
2525 ];
2626
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030
3131 src = fetchurl {
3232 url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
33− sha256 = "1v7zvvphkyw7x5ziysk4gs2rpgc4dr108fn4ja80kijs1jmj5dxr";
33+ sha256 = "12zqz9zi4jryvlk1rjxfl4jdj4a6n00018yyk95glfdrxda2xyib";
3434 };
3535
3636 installPhase = ''
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
4343
4444 makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \
4545 --prefix PATH : ${jdk}/bin \
46− --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ])} \
46+ --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk3 libXtst ])} \
4747 --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
4848
4949 # Create desktop item.
pkgs/top-level/all-packages.nix+3−1
@@ -2284,7 +2284,9 @@ in
22842284
22852285 davfs2 = callPackage ../tools/filesystems/davfs2 { };
22862286
2287− dbeaver = callPackage ../applications/misc/dbeaver { };
2287+ dbeaver = callPackage ../applications/misc/dbeaver {
2288+ jdk = jdk11;
2289+ };
22882290
22892291 dbench = callPackage ../development/tools/misc/dbench { };
22902292