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: 6e54e9253a28
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 693a4ce20973
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jul 1, 2018

  1. goldendict: 1.5.0.rc2 -> 2018-06-13 

    fixes build
    @gebner
    gebner committed Jul 1, 2018
    Copy the full SHA
    693a4ce View commit details
Showing with 8 additions and 6 deletions.
  1. +8 −6 pkgs/applications/misc/goldendict/default.nix
14 changes: 8 additions & 6 deletions pkgs/applications/misc/goldendict/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{ stdenv, fetchurl, pkgconfig, libXtst, libvorbis, hunspell
{ stdenv, fetchFromGitHub, pkgconfig, libXtst, libvorbis, hunspell
, libao, ffmpeg, libeb, lzo, xz, libtiff
, qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake }:
stdenv.mkDerivation rec {

name = "goldendict-1.5.0.rc2";
src = fetchurl {
url = "https://github.com/goldendict/goldendict/archive/1.5.0-RC2.tar.gz";
sha256 = "1pizz39l61rbps0wby75fkvzyrah805257j33siqybwhsfiy1kmw";
name = "goldendict-2018-06-13";
src = fetchFromGitHub {
owner = "goldendict";
repo = "goldendict";
rev = "48e850c7ec11d83cba7499f7fdce377ef3849bbb";
sha256 = "0i4q4waqjv45hgwillvjik97pg26kwlmz4925djjkx8s6hxgjlq9";
};

nativeBuildInputs = [ pkgconfig qmake ];
@@ -22,6 +24,6 @@ stdenv.mkDerivation rec {
description = "A feature-rich dictionary lookup program";

platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.astsmtl ];
maintainers = with stdenv.lib.maintainers; [ gebner astsmtl ];
};
}