diff options
author | Gabriel Ebner <gebner@gebner.org> | 2015-09-23 19:06:29 +0200 |
---|---|---|
committer | Gabriel Ebner <gebner@gebner.org> | 2015-09-24 07:45:47 +0200 |
commit | 4b9428038e279a40184106a9a8640788d7db01c3 (patch) | |
tree | 79fd59191db11ed10cd73ffe3530d4e8190a80e5 /pkgs/applications/misc/goldendict/default.nix | |
parent | 07cd629184251106f647a64bfe409e127491f805 (diff) |
goldendict: 1.0.1 -> 1.5.0.20150801
Diffstat (limited to 'pkgs/applications/misc/goldendict/default.nix')
-rw-r--r-- | pkgs/applications/misc/goldendict/default.nix | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 717d0a012a2c8..32a16e79c21e2 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -1,24 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, qt4, libXtst, libvorbis, phonon, hunspell }: +{ stdenv, fetchFromGitHub, pkgconfig, qt4, libXtst, libvorbis, hunspell, libao, ffmpeg, libeb, lzo, xz, libtiff }: stdenv.mkDerivation rec { - name = "goldendict-1.0.1"; - src = fetchurl { - url = "mirror://sourceforge/goldendict/${name}-src.tar.bz2"; - sha256 = "19p99dd5jgs0k66sy30vck7ymqj6dv1lh6w8xw18zczdll2h9yxk"; + name = "goldendict-1.5.0.20150801"; + src = fetchFromGitHub { + owner = "goldendict"; + repo = "goldendict"; + rev = "b4bb1e9635c764aa602fbeaeee661f35e461d062"; + sha256 = "0dhaa0nii226541al3i2d8x8h7cfh96w5vkw3pa3l74llgrj7yx2"; }; - buildInputs = [ pkgconfig qt4 libXtst libvorbis phonon hunspell ]; - unpackPhase = '' - mkdir ${name}-src - cd ${name}-src - tar xf ${src} - ''; - patches = [ ./goldendict-paths.diff ./gcc47.patch ]; - patchFlags = "-p 0"; + + buildInputs = [ pkgconfig qt4 libXtst libvorbis hunspell libao ffmpeg libeb lzo xz libtiff ]; configurePhase = '' - qmake - ''; - installPhase = '' - make INSTALL_ROOT="$out" install - rm -rf "$out/share/app-install" + qmake PREFIX=$out 'CONFIG+=zim_support' ''; meta = { |