From aa037e3af62554697411a54ab4b475b40e76dd1b Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 7 May 2009 14:51:29 +0000
Subject: [PATCH] also use gcc-4.2 for blender. gcc-4.3 is causing another
 segfault. I haven't checked pre 2.49 though

svn path=/nixpkgs/trunk/; revision=15499
---
 pkgs/applications/misc/blender/default.nix | 1 -
 pkgs/top-level/all-packages.nix            | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index fa10873bb386..7ab744f6a36b 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -13,7 +13,6 @@ stdenv.mkDerivation {
 
   buildInputs = [python scons
          gettext libjpeg libpng zlib freetype /* fmod smpeg */ freealut openal x11 mesa inputproto libtiff libXi 
-         ffmpeg
          ];
 
   # patch SConstruct so that we can pass on additional include.  Either blender
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 635b92190bf4..3c1d9a2ebc99 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5662,12 +5662,15 @@ let
   };
 
   blender = import ../applications/misc/blender {
-    inherit stdenv cmake mesa gettext freetype SDL libtiff fetchurl glibc scons x11 lib
+    inherit cmake mesa gettext freetype SDL libtiff fetchurl glibc scons x11 lib
       libjpeg libpng zlib /* smpeg sdl */ python;
     inherit (xlibs) inputproto libXi;
     freealut = freealut_soft;
     openal = openalSoft;
     openexr = openexr_1_4_0;
+    # using gcc43 makes blender segfault when pressing p then esc.
+    # is this related to the PHP bug? I'm to lazy to try recompilng it without optimizations
+    stdenv = overrideGCC stdenv gcc42;
   };
 
   bmp = import ../applications/audio/bmp {