diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-07-27 08:05:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-27 08:05:30 +0000 |
| commit | d82543f22d9e778a051ee866e6d2d8716a1cae0d (patch) | |
| tree | dde8598a81b6f2fdcde2bfc66d93d3701e9a3dbc /pkgs/applications | |
| parent | 3ae67b16063d4ca5341d7174b9fd94d288a53701 (diff) | |
| parent | 35ce59b03b0f3a93805952968245fd122b314f16 (diff) | |
| download | nixpkgs-d82543f22d9e778a051ee866e6d2d8716a1cae0d.tar nixpkgs-d82543f22d9e778a051ee866e6d2d8716a1cae0d.tar.gz nixpkgs-d82543f22d9e778a051ee866e6d2d8716a1cae0d.tar.bz2 nixpkgs-d82543f22d9e778a051ee866e6d2d8716a1cae0d.tar.lz nixpkgs-d82543f22d9e778a051ee866e6d2d8716a1cae0d.tar.xz nixpkgs-d82543f22d9e778a051ee866e6d2d8716a1cae0d.tar.zst nixpkgs-d82543f22d9e778a051ee866e6d2d8716a1cae0d.zip | |
Merge pull request #131477 from yaymukund/calibre-zeroconf
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index d27c9c9af65..07e0a62b901 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,6 +1,7 @@ { lib , mkDerivation , fetchurl +, fetchFromGitHub , poppler_utils , pkg-config , libpng @@ -94,7 +95,15 @@ mkDerivation rec { python regex sip - zeroconf + (zeroconf.overrideAttrs (oldAttrs: rec { + version = "0.31.0"; + src = fetchFromGitHub { + owner = "jstasiak"; + repo = "python-zeroconf"; + rev = version; + sha256 = "158dqay74zvnz6kmpvip4ml0kw59nf2aaajwgaamx0zc8ci1p5pj"; + }; + })) # the following are distributed with calibre, but we use upstream instead odfpy ] ++ lib.optional (unrarSupport) unrardll |