Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1a4498d1328e
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1970a4cd13b0
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Dec 9, 2018

  1. fbreader: fixup build with curl-7.62

    This was easy to patch; submitted upstream.
    
    (cherry picked from commit 17acf57)
    vcunat committed Dec 9, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    Copy the full SHA
    1970a4c View commit details
Showing with 9 additions and 2 deletions.
  1. +9 −2 pkgs/applications/misc/fbreader/default.nix
11 changes: 9 additions & 2 deletions pkgs/applications/misc/fbreader/default.nix
Original file line number Diff line number Diff line change
@@ -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