MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #89468 from sikmir/goldendict

Browse source 
goldendict: 2020-01-09 -> 2020-05-27
This commit is contained in:
Gabriel Ebner 2020-06-04 12:19:11 +02:00 committed by GitHub
commit fac1d3c4a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/applications/misc/goldendict/default.nix
View file

@ -6,17 +6,17 @@
, withExtraTiff ? true, libtiff
, withFFmpeg ? true, libao, ffmpeg
, withMultimedia ? true
, withZim ? true }:
, withZim ? true, zstd }:
mkDerivation rec {
pname = "goldendict";
version = "2020-01-09";
version = "2020-05-27";
src = fetchFromGitHub {
owner = "goldendict";
repo = pname;
rev = "da197ff5cd0e7326124c9240a1853a0e8b1de439";
sha256 = "0dlzwjh9wg4bzhhib71jycpp21qw762ww63a37dd50z1ymi61lxc";
rev = "ec40c1dcfde6df1dc7950443b46ae22c283b1e52";
sha256 = "1zmnwwnpnrqfyf7vmmh38r95q2fl4cqzbkp69bcwkr0xc80wgyz7";
};
patches = [
@ -39,7 +39,8 @@ mkDerivation rec {
++ stdenv.lib.optional withCC opencc
++ stdenv.lib.optional withEpwing libeb
++ stdenv.lib.optional withExtraTiff libtiff
++ stdenv.lib.optionals withFFmpeg [ libao ffmpeg ];
++ stdenv.lib.optionals withFFmpeg [ libao ffmpeg ]
++ stdenv.lib.optional withZim zstd;
qmakeFlags = with stdenv.lib; [
"goldendict.pro"