From 623d8590011787fc19aab8ae3bec546a70043666 Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Fri, 1 Dec 2017 13:05:45 +0100
Subject: redis-desktop-manager: 0.8.3 -> 0.9.0-alpha5

- Fixes build with latest Qt and glibc.
- Switches to Qt 5.9
---
 .../misc/redis-desktop-manager/default.nix         | 23 +++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'pkgs/applications/misc/redis-desktop-manager')

diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix
index 59d22b967b5..ca65e4bf7f8 100644
--- a/pkgs/applications/misc/redis-desktop-manager/default.nix
+++ b/pkgs/applications/misc/redis-desktop-manager/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, fetchgit, pkgconfig , libssh2
+{ stdenv, lib, fetchgit, fetchpatch, pkgconfig, libssh2
 , qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols
-, qtsvg, qttools, qtquick1
+, qtsvg, qttools, qtquick1, qtcharts
 , qmake
 }:
 
@@ -15,30 +15,35 @@ in
 
 stdenv.mkDerivation rec {
   name = "redis-desktop-manager-${version}";
-  version = "0.8.3";
+  version = "0.9.0-alpha5";
 
   src = fetchgit {
     url = "https://github.com/uglide/RedisDesktopManager.git";
     fetchSubmodules = true;
     rev = "refs/tags/${version}";
-    sha256 = "0a7xa39qp1q32zkypw32mm3wi8wbhxhvrm6l3xsa3k1jzih7hzxr";
+    sha256 = "1grw4zng0ff0lvplzzld133hlz6zjn5f5hl3z6z7kc1nq5642yr9";
   };
 
   nativeBuildInputs = [ pkgconfig qmake ];
   buildInputs = [
     libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats
-    qtquick1 qtquickcontrols qtsvg qttools
+    qtquick1 qtquickcontrols qtsvg qttools qtcharts
   ];
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/google/breakpad/commit/bddcc58860f522a0d4cbaa7e9d04058caee0db9d.patch";
+      sha256 = "1bcamjkmif62rb0lbp111r0ppf4raqw664m5by7vr3pdkcjbbilq";
+    })
+  ];
+
+  patchFlags = "-d 3rdparty/gbreakpad -p1";
+
   dontUseQmakeConfigure = true;
 
   buildPhase = ''
     srcdir=$PWD
 
-    substituteInPlace src/resources/qml/ValueTabs.qml \
-      --replace "import QtQuick.Controls 1.4" \
-                "import QtQuick.Controls 1.2"
-
     cat <<EOF > src/version.h
 #ifndef RDM_VERSION
     #define RDM_VERSION "${version}-120"
-- 
cgit 1.4.1