tjh.dev
dbeaver: 5.3.0 -> 6.0.2
With the required changes for the eclipse update.
(cherry picked from commit 6a6d6cdc0d5d36cc1e57442a945cb4944d15a931)
+5
-5
pkgs/applications/misc/dbeaver/default.nix
+5
-5
pkgs/applications/misc/dbeaver/default.nix
···
1
1
{ stdenv, fetchurl, makeDesktopItem, makeWrapper
2
-
, fontconfig, freetype, glib, gtk2
2
+
, fontconfig, freetype, glib, gtk3
3
3
, jdk, libX11, libXrender, libXtst, zlib }:
4
4
5
5
# The build process is almost like eclipse's.
···
7
7
8
8
stdenv.mkDerivation rec {
9
9
name = "dbeaver-ce-${version}";
10
-
version = "6.0.0";
10
+
version = "6.0.2";
11
11
12
12
desktopItem = makeDesktopItem {
13
13
name = "dbeaver";
···
20
20
};
21
21
22
22
buildInputs = [
23
-
fontconfig freetype glib gtk2
23
+
fontconfig freetype glib gtk3
24
24
jdk libX11 libXrender libXtst zlib
25
25
];
26
26
···
30
30
31
31
src = fetchurl {
32
32
url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
33
-
sha256 = "1v7zvvphkyw7x5ziysk4gs2rpgc4dr108fn4ja80kijs1jmj5dxr";
33
+
sha256 = "12zqz9zi4jryvlk1rjxfl4jdj4a6n00018yyk95glfdrxda2xyib";
34
34
};
35
35
36
36
installPhase = ''
···
43
43
44
44
makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \
45
45
--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 ])} \
47
47
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
48
48
49
49
# Create desktop item.
+3
-1
pkgs/top-level/all-packages.nix
+3
-1
pkgs/top-level/all-packages.nix
···
2212
2212
2213
2213
davfs2 = callPackage ../tools/filesystems/davfs2 { };
2214
2214
2215
-
dbeaver = callPackage ../applications/misc/dbeaver { };
2215
+
dbeaver = callPackage ../applications/misc/dbeaver {
2216
+
jdk = jdk11;
2217
+
};
2216
2218
2217
2219
dbench = callPackage ../development/tools/misc/dbench { };
2218
2220