From 93718907e4ea4bdbbcdabe7dc13dbf0e2d8b1787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 9 Nov 2010 14:30:58 +0000
Subject: [PATCH] Updating freeimage

svn path=/nixpkgs/trunk/; revision=24630
---
 pkgs/development/libraries/freeimage/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix
index ec402b6bee0..b2118eb1da4 100644
--- a/pkgs/development/libraries/freeimage/default.nix
+++ b/pkgs/development/libraries/freeimage/default.nix
@@ -1,17 +1,18 @@
 {stdenv, fetchurl, unzip}:
 stdenv.mkDerivation {
-  name = "freeimage-3.13.1";
+  name = "freeimage-3.14.1";
   src = fetchurl {
-    url = mirror://sourceforge/freeimage/FreeImage3131.zip;
-    sha256 = "1ilpfgyi3qhjra5hxvjcrq3bna909bgdl7rgmhkybmcpdq1x56rj";
+    url = mirror://sourceforge/freeimage/FreeImage3141.zip;
+    sha256 = "0rgzdjwzd64z5z9j4bq075h3kfqjk8ab2dwswy0lnzw9jvmbbifm";
   };
   buildInputs = [ unzip ];
-  patchPhase = ''
+  prePatch = ''
       sed -e s@/usr/@$out/@ \
         -e 's@-o root -g root@@' \
         -e 's@ldconfig@echo not running ldconfig@' \
         -i Makefile.gnu
   '';
+  patches = [ ./memset.patch ];
   preInstall = "mkdir -p $out/include $out/lib";
 
   meta = {