From 214b35d11521573de3f6b3dcf3cc421d41ce4b7e Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 3 Jun 2018 20:37:40 +0000 Subject: [PATCH] freeimage: fix build with glibc 2.27 --- pkgs/development/libraries/freeimage/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index 157f9f3936ec..b2c66ad346d0 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation { url = patchURL + "/Fix-CVE-2016-5684.patch"; sha256 = "14ffgqbnwg28r6sjvm3z89zbnnm9ghbc81hdhrzxlyk3vwvd6cw3"; }) + (fetchurl { + url = https://raw.githubusercontent.com/buildroot/buildroot/2018.05/package/libfreeimage/0005-Manage-powf64-with-glibc.patch; + sha256 = "1lis479ad5cfkhqm044nk4x97wfwm3hry3bvij1w5xkndnlfppc2"; + }) ]; buildInputs = [ unzip ] ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; @@ -57,6 +61,8 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + enableParallelBuilding = true; + meta = { description = "Open Source library for accessing popular graphics image file formats"; homepage = http://freeimage.sourceforge.net/;