mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 14:41:17 +00:00
blender: fix parallel builds
(cherry picked from commitsf63fb3fda0
+5fa61a2904
)
This commit is contained in:
parent
23c5e6b559
commit
4d6503e5b5
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue