From 6a6d6cdc0d5d36cc1e57442a945cb4944d15a931 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 14 Apr 2019 13:22:40 -0400
Subject: [PATCH] dbeaver: 5.3.0 -> 6.0.2
With the required changes for the eclipse update.
---
pkgs/applications/misc/dbeaver/default.nix | 10 +++++-----
pkgs/top-level/all-packages.nix | 4 +++-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index 51683a0a720..626b62ed7d0 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -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.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 834418a364d..d7e08497662 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2257,7 +2257,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 { };