diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2011-03-28 10:22:55 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2011-03-28 10:22:55 +0000 |
| commit | 5142fda2bf98a5218c3684f258e826ecec8dd838 (patch) | |
| tree | b75df2427ffce24e8bb670f9f9b8f33be8451b68 /pkgs/development/libraries/freeimage | |
| parent | 1233bbb9fa2a001fac8d09e875f32dcafdfa997f (diff) | |
| download | nixlib-5142fda2bf98a5218c3684f258e826ecec8dd838.tar nixlib-5142fda2bf98a5218c3684f258e826ecec8dd838.tar.gz nixlib-5142fda2bf98a5218c3684f258e826ecec8dd838.tar.bz2 nixlib-5142fda2bf98a5218c3684f258e826ecec8dd838.tar.lz nixlib-5142fda2bf98a5218c3684f258e826ecec8dd838.tar.xz nixlib-5142fda2bf98a5218c3684f258e826ecec8dd838.tar.zst nixlib-5142fda2bf98a5218c3684f258e826ecec8dd838.zip | |
Updating freeimage.
svn path=/nixpkgs/trunk/; revision=26560
Diffstat (limited to 'pkgs/development/libraries/freeimage')
| -rw-r--r-- | pkgs/development/libraries/freeimage/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/freeimage/memset.patch | 11 |
2 files changed, 3 insertions, 15 deletions
diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index b2118eb1da42..ec381dc433a6 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.14.1"; + name = "freeimage-3.15.0"; src = fetchurl { - url = mirror://sourceforge/freeimage/FreeImage3141.zip; - sha256 = "0rgzdjwzd64z5z9j4bq075h3kfqjk8ab2dwswy0lnzw9jvmbbifm"; + url = mirror://sourceforge/freeimage/FreeImage3150.zip; + sha256 = "0diyj862sdqwjqb7v2nccf8cl6886v937jkw6dgszp86qpwsfx3n"; }; buildInputs = [ unzip ]; prePatch = '' @@ -12,7 +12,6 @@ stdenv.mkDerivation { -e 's@ldconfig@echo not running ldconfig@' \ -i Makefile.gnu ''; - patches = [ ./memset.patch ]; preInstall = "mkdir -p $out/include $out/lib"; meta = { diff --git a/pkgs/development/libraries/freeimage/memset.patch b/pkgs/development/libraries/freeimage/memset.patch deleted file mode 100644 index 91eabf10fdc8..000000000000 --- a/pkgs/development/libraries/freeimage/memset.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN a/Source/OpenEXR/Imath/ImathMatrix.h b/Source/OpenEXR/Imath/ImathMatrix.h ---- a/Source/OpenEXR/Imath/ImathMatrix.h 2010-07-17 12:48:40.000000000 +0200 -+++ b/Source/OpenEXR/Imath/ImathMatrix.h 2010-09-03 18:38:37.138598422 +0200 -@@ -49,6 +49,7 @@ - #include "ImathVec.h" - #include "ImathShear.h" - -+#include <string.h> - #include <iostream> - #include <iomanip> - |