diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-12-09 10:27:22 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-12-09 10:27:22 +0100 |
| commit | 17acf57f9dabe8364abe46c39e2b4e993db142ac (patch) | |
| tree | 098ee5b1ac31bec197c90973ca3bd6394c49f2a8 | |
| parent | 9a37ec0d615895b86f5785ef0a2162dd653e9206 (diff) | |
| download | nixlib-17acf57f9dabe8364abe46c39e2b4e993db142ac.tar nixlib-17acf57f9dabe8364abe46c39e2b4e993db142ac.tar.gz nixlib-17acf57f9dabe8364abe46c39e2b4e993db142ac.tar.bz2 nixlib-17acf57f9dabe8364abe46c39e2b4e993db142ac.tar.lz nixlib-17acf57f9dabe8364abe46c39e2b4e993db142ac.tar.xz nixlib-17acf57f9dabe8364abe46c39e2b4e993db142ac.tar.zst nixlib-17acf57f9dabe8364abe46c39e2b4e993db142ac.zip | |
fbreader: fixup build with curl-7.62
This was easy to patch; submitted upstream.
| -rw-r--r-- | pkgs/applications/misc/fbreader/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix index 548966764fe6..e7d0e6a63a59 100644 --- a/pkgs/applications/misc/fbreader/default.nix +++ b/pkgs/applications/misc/fbreader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig , bzip2, curl, expat, fribidi, libunibreak, sqlite, zlib , uiTarget ? if !stdenv.isDarwin then "desktop" else "macosx" , uiType ? if !stdenv.isDarwin then "qt4" else "cocoa" @@ -25,7 +25,14 @@ stdenv.mkDerivation { sha256 = "0lzafk02mv0cf2l2a61q5y4743zi913byik4bw1ix0gr1drnsa7y"; }; - patches = [ ./typecheck.patch ]; + patches = [ + ./typecheck.patch + (fetchpatch { + name = "curl-7_62.diff"; # see https://github.com/geometer/FBReader/pull/311 + url = "https://github.com/geometer/FBReader/commit/b7c78e965d06f780.diff"; + sha256 = "1dgnx9wps7hcf8fkidc7037vcf92fr3ccnjx7bgxm9x02j0hngjg"; + }) + ]; postPatch = '' cat << EOF > makefiles/target.mk |