diff options
| author | Robin Gloster <mail@glob.in> | 2017-01-21 14:43:22 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-01-25 20:12:40 +0100 |
| commit | d31b3a9e6dad213fe60b0fe1ede1ca4b87e055f5 (patch) | |
| tree | 300fe03be4925b7ad4971dc57082f86a3fcdcedf /pkgs/development/libraries/freeimage | |
| parent | 8cae089f199552ef7629421eb73b67901f45c8d7 (diff) | |
| download | nixpkgs-d31b3a9e6dad213fe60b0fe1ede1ca4b87e055f5.tar nixpkgs-d31b3a9e6dad213fe60b0fe1ede1ca4b87e055f5.tar.gz nixpkgs-d31b3a9e6dad213fe60b0fe1ede1ca4b87e055f5.tar.bz2 nixpkgs-d31b3a9e6dad213fe60b0fe1ede1ca4b87e055f5.tar.lz nixpkgs-d31b3a9e6dad213fe60b0fe1ede1ca4b87e055f5.tar.xz nixpkgs-d31b3a9e6dad213fe60b0fe1ede1ca4b87e055f5.tar.zst nixpkgs-d31b3a9e6dad213fe60b0fe1ede1ca4b87e055f5.zip | |
freeimage: fix build with gcc6
Diffstat (limited to 'pkgs/development/libraries/freeimage')
| -rw-r--r-- | pkgs/development/libraries/freeimage/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index 42105c7022c..6ee7670fc29 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -1,11 +1,15 @@ -{stdenv, fetchurl, unzip, darwin}: +{ stdenv, fetchurl, unzip, darwin }: + stdenv.mkDerivation { name = "freeimage-3.17.0"; + src = fetchurl { url = mirror://sourceforge/freeimage/FreeImage3170.zip; sha256 = "12bz57asdcfsz3zr9i9nska0fb6h3z2aizy412qjqkixkginbz7v"; }; + buildInputs = [ unzip ] ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; + prePatch = if stdenv.isDarwin then '' sed -e 's/gcc-4.0/clang/g' \ @@ -38,6 +42,8 @@ stdenv.mkDerivation { preInstall = "mkdir -p $out/include $out/lib"; postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) "make -f Makefile.fip install"; + NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + meta = { description = "Open Source library for accessing popular graphics image file formats"; homepage = http://freeimage.sourceforge.net/; |