tjh.dev
fbreader: fixup build with curl-7.62
This was easy to patch; submitted upstream.
+9
-2
pkgs/applications/misc/fbreader/default.nix
+9
-2
pkgs/applications/misc/fbreader/default.nix
···
1
-
{ stdenv, fetchFromGitHub, pkgconfig
1
+
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig
2
2
, bzip2, curl, expat, fribidi, libunibreak, sqlite, zlib
3
3
, uiTarget ? if !stdenv.isDarwin then "desktop" else "macosx"
4
4
, uiType ? if !stdenv.isDarwin then "qt4" else "cocoa"
···
25
25
sha256 = "0lzafk02mv0cf2l2a61q5y4743zi913byik4bw1ix0gr1drnsa7y";
26
26
};
27
27
28
-
patches = [ ./typecheck.patch ];
28
+
patches = [
29
+
./typecheck.patch
30
+
(fetchpatch {
31
+
name = "curl-7_62.diff"; # see https://github.com/geometer/FBReader/pull/311
32
+
url = "https://github.com/geometer/FBReader/commit/b7c78e965d06f780.diff";
33
+
sha256 = "1dgnx9wps7hcf8fkidc7037vcf92fr3ccnjx7bgxm9x02j0hngjg";
34
+
})
35
+
];
29
36
30
37
postPatch = ''
31
38
cat << EOF > makefiles/target.mk