diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-11-09 14:30:58 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-11-09 14:30:58 +0000 |
commit | 93718907e4ea4bdbbcdabe7dc13dbf0e2d8b1787 (patch) | |
tree | aec49a5b2874f6a0fe0026a630e8d8ef966ef2df /pkgs/development | |
parent | 55be5106fd1901d4ac2bb0ec88f81ec881b81cf5 (diff) | |
download | nixpkgs-93718907e4ea4bdbbcdabe7dc13dbf0e2d8b1787.tar nixpkgs-93718907e4ea4bdbbcdabe7dc13dbf0e2d8b1787.tar.gz nixpkgs-93718907e4ea4bdbbcdabe7dc13dbf0e2d8b1787.tar.bz2 nixpkgs-93718907e4ea4bdbbcdabe7dc13dbf0e2d8b1787.tar.lz nixpkgs-93718907e4ea4bdbbcdabe7dc13dbf0e2d8b1787.tar.xz nixpkgs-93718907e4ea4bdbbcdabe7dc13dbf0e2d8b1787.tar.zst nixpkgs-93718907e4ea4bdbbcdabe7dc13dbf0e2d8b1787.zip |
Updating freeimage
svn path=/nixpkgs/trunk/; revision=24630
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/freeimage/default.nix | 9 |
1 files 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 = { |