summary refs log tree commit diff
path: root/pkgs/development/libraries/freeimage
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2018-06-03 20:37:40 +0000
committerOrivej Desh <orivej@gmx.fr>2018-06-03 20:38:08 +0000
commit214b35d11521573de3f6b3dcf3cc421d41ce4b7e (patch)
tree2b2f0cd6918963d56565a4318412588e1cc6b9c4 /pkgs/development/libraries/freeimage
parent76f6dc177220296ca32bb76ad662198b5d5eaced (diff)
downloadnixpkgs-214b35d11521573de3f6b3dcf3cc421d41ce4b7e.tar
nixpkgs-214b35d11521573de3f6b3dcf3cc421d41ce4b7e.tar.gz
nixpkgs-214b35d11521573de3f6b3dcf3cc421d41ce4b7e.tar.bz2
nixpkgs-214b35d11521573de3f6b3dcf3cc421d41ce4b7e.tar.lz
nixpkgs-214b35d11521573de3f6b3dcf3cc421d41ce4b7e.tar.xz
nixpkgs-214b35d11521573de3f6b3dcf3cc421d41ce4b7e.tar.zst
nixpkgs-214b35d11521573de3f6b3dcf3cc421d41ce4b7e.zip
freeimage: fix build with glibc 2.27
Diffstat (limited to 'pkgs/development/libraries/freeimage')
-rw-r--r--pkgs/development/libraries/freeimage/default.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix
index 157f9f3936e..b2c66ad346d 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/;