diff options
| author | Gabriel Ebner <gebner@gebner.org> | 2016-06-20 17:59:00 +0200 |
|---|---|---|
| committer | Gabriel Ebner <gebner@gebner.org> | 2016-06-20 17:59:37 +0200 |
| commit | 05a89a6512210b0474ea11a1f5d93f9e6fefea56 (patch) | |
| tree | f59e61ac6ccd8acb776684851ee7429f6f6e1a44 | |
| parent | 06d3636596b415c240d458b815f53f9b51d55de7 (diff) | |
| download | nixlib-05a89a6512210b0474ea11a1f5d93f9e6fefea56.tar nixlib-05a89a6512210b0474ea11a1f5d93f9e6fefea56.tar.gz nixlib-05a89a6512210b0474ea11a1f5d93f9e6fefea56.tar.bz2 nixlib-05a89a6512210b0474ea11a1f5d93f9e6fefea56.tar.lz nixlib-05a89a6512210b0474ea11a1f5d93f9e6fefea56.tar.xz nixlib-05a89a6512210b0474ea11a1f5d93f9e6fefea56.tar.zst nixlib-05a89a6512210b0474ea11a1f5d93f9e6fefea56.zip | |
goldendict: 1.5.0.ec86515 -> 1.5.0.rc2
| -rw-r--r-- | pkgs/applications/misc/goldendict/default.nix | 19 | ||||
| -rw-r--r-- | 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 facbe50662c8..be36eeceb6b6 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 95c5ada10efa..ecbcdb62681f 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 { }; |