diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-12-23 18:16:47 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-12-23 18:17:09 +0100 |
| commit | 49f53f63f5b5ae771822f05f80d150068cb57284 (patch) | |
| tree | 042f0fa82c47fa55b12d47df223fbe08335a434a /pkgs/applications/misc/blender | |
| parent | a4961f09f62a8a7bfc441ad04d55ea3a55932ab8 (diff) | |
blender: Add OpenCOLLADA support
Diffstat (limited to 'pkgs/applications/misc/blender')
| -rw-r--r-- | pkgs/applications/misc/blender/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 01f9b861bf276..4c48324baba98 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -4,6 +4,7 @@ , zlib, fftw , jackaudioSupport ? false, jack2 , cudaSupport ? false, cudatoolkit6 +, colladaSupport ? true, opencollada }: with lib; @@ -22,7 +23,8 @@ stdenv.mkDerivation rec { opencolorio openexr openimageio /* openjpeg */ python zlib fftw ] ++ optional jackaudioSupport jack2 - ++ optional cudaSupport cudatoolkit6; + ++ optional cudaSupport cudatoolkit6 + ++ optional colladaSupport opencollada; postUnpack = '' @@ -30,8 +32,7 @@ stdenv.mkDerivation rec { ''; cmakeFlags = - [ "-DWITH_OPENCOLLADA=OFF" - "-DWITH_MOD_OCEANSIM=ON" + [ "-DWITH_MOD_OCEANSIM=ON" "-DWITH_CODEC_FFMPEG=ON" "-DWITH_CODEC_SNDFILE=ON" "-DWITH_INSTALL_PORTABLE=OFF" @@ -41,7 +42,8 @@ stdenv.mkDerivation rec { "-DPYTHON_VERSION=${python.majorVersion}" ] ++ optional jackaudioSupport "-DWITH_JACK=ON" - ++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON"; + ++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON" + ++ optional colladaSupport "-DWITH_OPENCOLLADA=ON"; NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}m"; |