Author: viric
Date: Tue Nov 9 14:30:58 2010
New Revision: 24630
URL: https://svn.nixos.org/websvn/nix/?rev=24630&sc=1
Log:
Updating freeimage
Modified:
nixpkgs/trunk/pkgs/development/libraries/freeimage/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/freeimage/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/freeimage/default.nix Tue Nov
9 14:09:22 2010 (r24629)
+++ nixpkgs/trunk/pkgs/development/libraries/freeimage/default.nix Tue Nov
9 14:30:58 2010 (r24630)
@@ -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 = {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
