diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-02-28 11:56:51 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-02-28 17:50:42 +0100 |
| commit | ffb0fb51d4b4f29b72008a17292bdc4634873e87 (patch) | |
| tree | 0193d99de22fa4559d08613f22be7336b56ae0c7 /pkgs/applications/misc/blender | |
| parent | 6405bbe8671c3a184ce09fc42c468604ec0a5fa7 (diff) | |
| download | nixpkgs-ffb0fb51d4b4f29b72008a17292bdc4634873e87.tar nixpkgs-ffb0fb51d4b4f29b72008a17292bdc4634873e87.tar.gz nixpkgs-ffb0fb51d4b4f29b72008a17292bdc4634873e87.tar.bz2 nixpkgs-ffb0fb51d4b4f29b72008a17292bdc4634873e87.tar.lz nixpkgs-ffb0fb51d4b4f29b72008a17292bdc4634873e87.tar.xz nixpkgs-ffb0fb51d4b4f29b72008a17292bdc4634873e87.tar.zst nixpkgs-ffb0fb51d4b4f29b72008a17292bdc4634873e87.zip | |
blender: 2.78b -> 2.78c
Diffstat (limited to 'pkgs/applications/misc/blender')
| -rw-r--r-- | pkgs/applications/misc/blender/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 76810a6f249..a7b15646f03 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -11,11 +11,11 @@ with lib; stdenv.mkDerivation rec { - name = "blender-2.78b"; + name = "blender-2.78c"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "0wgrqwznih6c19y2fpvrk3k6qsaxsy3g7xja87rb4hq7r7j8x22d"; + sha256 = "0f6k3m9yd5yhn7fq9srgzwh2gachlxm03bdrvn2r7xq00grqzab4"; }; buildInputs = @@ -54,7 +54,12 @@ stdenv.mkDerivation rec { "-DWITH_PYTHON_INSTALL_NUMPY=OFF" ] ++ optional jackaudioSupport "-DWITH_JACK=ON" - ++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON" + ++ optionals cudaSupport + [ "-DWITH_CYCLES_CUDA_BINARIES=ON" + # Disable the sm_20 architecture to work around a segfault in + # ptxas, as suggested on #blendercoders. + "-DCYCLES_CUDA_BINARIES_ARCH=sm_21;sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61" + ] ++ optional colladaSupport "-DWITH_OPENCOLLADA=ON"; NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}m"; |