diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-07-21 09:57:16 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-02 11:17:25 +0200 |
| commit | 4d6503e5b51b34b8f1603d5078b0c897a693f912 (patch) | |
| tree | ab856ec05d7e4752128fe32d3b55946ecf8315ec /pkgs/applications/misc/blender/default.nix | |
| parent | 23c5e6b559143caefe5420948cb522dfbf38f3d1 (diff) | |
| download | nixpkgs-4d6503e5b51b34b8f1603d5078b0c897a693f912.tar nixpkgs-4d6503e5b51b34b8f1603d5078b0c897a693f912.tar.gz nixpkgs-4d6503e5b51b34b8f1603d5078b0c897a693f912.tar.bz2 nixpkgs-4d6503e5b51b34b8f1603d5078b0c897a693f912.tar.lz nixpkgs-4d6503e5b51b34b8f1603d5078b0c897a693f912.tar.xz nixpkgs-4d6503e5b51b34b8f1603d5078b0c897a693f912.tar.zst nixpkgs-4d6503e5b51b34b8f1603d5078b0c897a693f912.zip | |
blender: fix parallel builds
(cherry picked from commits f63fb3fda0200754 + 5fa61a29048115b21)
Diffstat (limited to 'pkgs/applications/misc/blender/default.nix')
| -rw-r--r-- | pkgs/applications/misc/blender/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 13d0bfa7a42..a31fcfeab0f 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -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" |