blender update to 2.48

adding some patches to compile dependencies and gav

svn path=/nixpkgs/trunk/; revision=15474

2 files changed, 26 insertions, 0 deletions

diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix
index bfb2c6b998a9..de4672ceb5ec 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/default.nix
@@ -12,4 +12,5 @@ stdenv.mkDerivation {
   buildInputs = [pkgconfig zlib] ++ (lib.optional (args ? ctl) (args.ctl));
   propagatedBuildInputs = [pkgconfig zlib ilmbase];
   configureFlags = "--enable-imfexamples";
+  patches = [ ./stringh.patch ];
 }
diff --git a/pkgs/development/libraries/openexr/stringh.patch b/pkgs/development/libraries/openexr/stringh.patch
new file mode 100644
index 000000000000..ef8cf06b24ae
--- /dev/null
+++ b/pkgs/development/libraries/openexr/stringh.patch
@@ -0,0 +1,25 @@
+diff --git a/exrenvmap/main.cpp b/exrenvmap/main.cpp
+index c5afcc5..5e993b3 100644
+--- a/exrenvmap/main.cpp
++++ b/exrenvmap/main.cpp
+@@ -45,6 +45,7 @@
+ #include <iostream>
+ #include <exception>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ using namespace Imf;
+ using namespace std;
+diff --git a/exrmaketiled/main.cpp b/exrmaketiled/main.cpp
+index 5ce4e95..f93ec08 100644
+--- a/exrmaketiled/main.cpp
++++ b/exrmaketiled/main.cpp
+@@ -44,7 +44,7 @@
+ 
+ #include <iostream>
+ #include <exception>
+-#include <string>
++#include <string.h>
+ #include <stdlib.h>
+ 
+ using namespace Imf;