Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5cf0de2485ef
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fac1d3c4a732
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 4, 2020

  1. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    sikmir Nikolay Korotkiy
    Copy the full SHA
    7384e9b View commit details
  2. Merge pull request #89468 from sikmir/goldendict

    goldendict: 2020-01-09 -> 2020-05-27
    gebner authored Jun 4, 2020
    1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    fac1d3c View commit details
Showing with 6 additions and 5 deletions.
  1. +6 −5 pkgs/applications/misc/goldendict/default.nix
11 changes: 6 additions & 5 deletions pkgs/applications/misc/goldendict/default.nix
Original file line number Diff line number Diff line change
@@ -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"