public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fbreader: fixup build with curl-7.62

Browse Source 
This was easy to patch; submitted upstream.
This commit is contained in:
Vladimír Čunát 2018-12-09 10:27:22 +01:00
parent 9a37ec0d61
commit 17acf57f9d
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/misc/fbreader/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig { stdenv, fetchFromGitHub, fetchpatch, pkgconfig
, bzip2, curl, expat, fribidi, libunibreak, sqlite, zlib , bzip2, curl, expat, fribidi, libunibreak, sqlite, zlib
, uiTarget ? if !stdenv.isDarwin then "desktop" else "macosx" , uiTarget ? if !stdenv.isDarwin then "desktop" else "macosx"
, uiType ? if !stdenv.isDarwin then "qt4" else "cocoa" , uiType ? if !stdenv.isDarwin then "qt4" else "cocoa"
@ -25,7 +25,14 @@ stdenv.mkDerivation {
sha256 = "0lzafk02mv0cf2l2a61q5y4743zi913byik4bw1ix0gr1drnsa7y"; 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 = '' postPatch = ''
cat << EOF > makefiles/target.mk cat << EOF > makefiles/target.mk