From 05a89a6512210b0474ea11a1f5d93f9e6fefea56 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Mon, 20 Jun 2016 17:59:00 +0200
Subject: [PATCH] goldendict: 1.5.0.ec86515 -> 1.5.0.rc2

---
 pkgs/applications/misc/goldendict/default.nix | 19 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix
index facbe50662c..be36eeceb6b 100644
--- a/pkgs/applications/misc/goldendict/default.nix
+++ b/pkgs/applications/misc/goldendict/default.nix
@@ -1,17 +1,16 @@
-{ stdenv, fetchFromGitHub, pkgconfig, qt4, qmake4Hook, libXtst, libvorbis, hunspell
-, libao, ffmpeg, libeb, lzo, xz, libtiff }:
+{ stdenv, fetchurl, pkgconfig, libXtst, libvorbis, hunspell
+, libao, ffmpeg, libeb, lzo, xz, libtiff
+, qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmakeHook }:
 stdenv.mkDerivation rec {
-  name = "goldendict-1.5.0.ec86515";
-  src = fetchFromGitHub {
-    owner = "goldendict";
-    repo = "goldendict";
-    rev = "ec865158f5b7116f629e4d451a39ee59093eefa5";
-    sha256 = "070majwxbn15cy7sbgz7ljl8rkn7vcgkm10884v97csln7bfzwhr";
+  name = "goldendict-1.5.0.rc2";
+  src = fetchurl {
+    url = "https://github.com/goldendict/goldendict/archive/1.5.0-RC2.tar.gz";
+    sha256 = "1pizz39l61rbps0wby75fkvzyrah805257j33siqybwhsfiy1kmw";
   };
 
   buildInputs = [
-    pkgconfig qt4 libXtst libvorbis hunspell libao ffmpeg libeb
-    lzo xz libtiff qmake4Hook
+    pkgconfig qtbase qtsvg qtwebkit qtx11extras qttools libXtst libvorbis hunspell libao ffmpeg libeb
+    lzo xz libtiff qmakeHook
   ];
 
   qmakeFlags = [ "CONFIG+=zim_support" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95c5ada10ef..ecbcdb62681 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12645,7 +12645,7 @@ in
 
   gnuradio-osmosdr = callPackage ../applications/misc/gnuradio-osmosdr { };
 
-  goldendict = callPackage ../applications/misc/goldendict { };
+  goldendict = qt55.callPackage ../applications/misc/goldendict { };
 
   google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { };