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
This commit is contained in:
parent
f0e8c6aaef
commit
aa037e3af6
2 changed files with 4 additions and 2 deletions
|
@ -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
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in a new issue