ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 13:57:10 +03:00
Code Issues Projects Releases Wiki Activity

blender: fix parallel builds

Browse Source 
(cherry picked from commits f63fb3fda0 + 5fa61a2904)
This commit is contained in:
Vladimír Čunát 2014-07-21 09:57:16 +02:00
parent 23c5e6b559
commit 4d6503e5b5
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/misc/blender/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, SDL, boost, cmake, ffmpeg, gettext, glew
{ stdenv, lib, fetchurl, fetchpatch, SDL, boost, cmake, ffmpeg, gettext, glew
, ilmbase, libXi, libjpeg, libpng, libsamplerate, libsndfile
, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python
, zlib, fftw
@ -26,6 +26,13 @@ stdenv.mkDerivation rec {
substituteInPlace */doc/manpage/blender.1.py --replace /usr/bin/python ${python}/bin/python3
'';
patches = [(fetchpatch { # fix parallel builds
url = "https://developer.blender.org/D619?download=true";
sha256 = "18h4fqsbpwxzqz7qby18lrrbzqnyd5xnann3xcac5wddwv5wjb0f";
name = "D619.diff";
})];
patchFlags = "-p0";
cmakeFlags =
[ "-DOPENEXR_INC=${openexr}/include/OpenEXR"
"-DWITH_OPENCOLLADA=OFF"