mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 14:45:27 +00:00
Code Issues Wiki Activity

Updating freeimage.

Browse source 
svn path=/nixpkgs/trunk/; revision=26560
This commit is contained in:
Lluís Batlle i Rossell 2011-03-28 10:22:55 +00:00
parent 1233bbb9fa
commit 5142fda2bf
2 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/libraries/freeimage/default.nix
View file

@ -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 = {

11
pkgs/development/libraries/freeimage/memset.patch
View file

@ -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>