diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2016-03-31 12:35:15 +0200 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2016-03-31 12:35:57 +0200 |
| commit | d2c00001f8a5c99cab09992d104f795025d37fce (patch) | |
| tree | e57fcd2c8ceefbf65b3ad0a29e6c0c1cd1011fb8 /pkgs/development/libraries/freeimage | |
| parent | e60be0923ba138d3309038585b8d04db5affda86 (diff) | |
| download | nixpkgs-d2c00001f8a5c99cab09992d104f795025d37fce.tar nixpkgs-d2c00001f8a5c99cab09992d104f795025d37fce.tar.gz nixpkgs-d2c00001f8a5c99cab09992d104f795025d37fce.tar.bz2 nixpkgs-d2c00001f8a5c99cab09992d104f795025d37fce.tar.lz nixpkgs-d2c00001f8a5c99cab09992d104f795025d37fce.tar.xz nixpkgs-d2c00001f8a5c99cab09992d104f795025d37fce.tar.zst nixpkgs-d2c00001f8a5c99cab09992d104f795025d37fce.zip | |
freeimage: updating to 3.17
It is buggy in 32-bit: sizeof(uint64) != 8 !!.
Diffstat (limited to 'pkgs/development/libraries/freeimage')
| -rw-r--r-- | pkgs/development/libraries/freeimage/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index 2cfb5d3522f..2a75f7693e1 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "freeimage-3.15.3"; + name = "freeimage-3.17.0"; src = fetchurl { - url = mirror://sourceforge/freeimage/FreeImage3153.zip; - sha256 = "0i60fn1n9rw55dci0yw92zrw7k1jz3f9kv2z1wxmh84s5ngxa626"; + url = mirror://sourceforge/freeimage/FreeImage3170.zip; + sha256 = "12bz57asdcfsz3zr9i9nska0fb6h3z2aizy412qjqkixkginbz7v"; }; buildInputs = [ unzip ]; prePatch = '' @@ -11,6 +11,10 @@ stdenv.mkDerivation { -e 's@-o root -g root@@' \ -e 's@ldconfig@echo not running ldconfig@' \ -i Makefile.gnu Makefile.fip + + # Fix gcc 5.1 macro problems + # https://chromium.googlesource.com/webm/libwebp/+/eebaf97f5a1cb713d81d311308d8a48c124e5aef%5E!/ + sed -i -e 's/"\(#[^"]*\)"/" \1 "/g' Source/LibWebP/src/dsp/* ''; postBuild = "make -f Makefile.fip"; |