diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-06-28 12:59:02 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-28 12:59:02 +0300 |
| commit | 1c851e8c92b76a00ce84167984a7ec7ba2b1f29c (patch) | |
| tree | 84d6e68df178fa18b91a77c423b0c0c74017754b /pkgs/applications/misc | |
| parent | 8f342bfa950f610e7497800e707111d69646f801 (diff) | |
| parent | 4b521a61df7f578b56015a6b70ce2e41e6d26bba (diff) | |
| download | nixpkgs-1c851e8c92b76a00ce84167984a7ec7ba2b1f29c.tar nixpkgs-1c851e8c92b76a00ce84167984a7ec7ba2b1f29c.tar.gz nixpkgs-1c851e8c92b76a00ce84167984a7ec7ba2b1f29c.tar.bz2 nixpkgs-1c851e8c92b76a00ce84167984a7ec7ba2b1f29c.tar.lz nixpkgs-1c851e8c92b76a00ce84167984a7ec7ba2b1f29c.tar.xz nixpkgs-1c851e8c92b76a00ce84167984a7ec7ba2b1f29c.tar.zst nixpkgs-1c851e8c92b76a00ce84167984a7ec7ba2b1f29c.zip | |
Merge pull request #240054 from wegank/goldendict-bump
goldendict: 2022-05-10 -> 1.5.0
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/goldendict/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 097dbe58ec5..1222fefab07 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -1,6 +1,7 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config +{ lib, stdenv, fetchFromGitHub, pkg-config , libXtst, libvorbis, hunspell, lzo, xz, bzip2, libiconv , qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake +, wrapQtAppsHook , withCC ? true, opencc , withEpwing ? true, libeb , withExtraTiff ? true, libtiff @@ -8,20 +9,19 @@ , withMultimedia ? true , withZim ? true, zstd }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "goldendict"; - version = "2022-05-10"; + version = "1.5.0"; src = fetchFromGitHub { owner = "goldendict"; repo = pname; - rev = "f810c6bd724e61977b4e94ca2d8abfa5bd766379"; - sha256 = "sha256-gNM+iahoGQy8TlNFLQx5ksITzQznv7MWMX/88QCTnL0"; + rev = "v${version}"; + hash = "sha256-80o8y+mbzpyMQYUGHYs/zgQT23nLVCs7Jcr8FbbXn8M="; }; patches = [ ./0001-dont-check-for-updates.patch - ] ++ lib.optionals stdenv.isDarwin [ ./0001-dont-use-maclibs.patch ]; @@ -31,7 +31,7 @@ mkDerivation rec { --replace "opencc.2" "opencc" ''; - nativeBuildInputs = [ pkg-config qmake ]; + nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; buildInputs = [ qtbase qtsvg qtwebkit qttools libvorbis hunspell xz lzo |