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 | |
| parent | a4961f09f62a8a7bfc441ad04d55ea3a55932ab8 (diff) | |
| download | nixpkgs-49f53f63f5b5ae771822f05f80d150068cb57284.tar nixpkgs-49f53f63f5b5ae771822f05f80d150068cb57284.tar.gz nixpkgs-49f53f63f5b5ae771822f05f80d150068cb57284.tar.bz2 nixpkgs-49f53f63f5b5ae771822f05f80d150068cb57284.tar.lz nixpkgs-49f53f63f5b5ae771822f05f80d150068cb57284.tar.xz nixpkgs-49f53f63f5b5ae771822f05f80d150068cb57284.tar.zst nixpkgs-49f53f63f5b5ae771822f05f80d150068cb57284.zip | |
blender: Add OpenCOLLADA support
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/blender/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/opencollada/default.nix | 28 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 36 insertions, 4 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 01f9b861bf2..4c48324baba 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"; diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix new file mode 100644 index 00000000000..20003f23874 --- /dev/null +++ b/pkgs/development/libraries/opencollada/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2, pcre }: + +# The exact revision specified by Blender's install_deps.sh script. +let rev = "18da7f4109a8eafaa290a33f5550501cc4c8bae8"; in + +stdenv.mkDerivation { + name = "opencollada-1.3-${rev}"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "OpenCOLLADA"; + inherit rev; + sha256 = "0ach32ws95mh0ijd8sr22kxka3riq72bb9ng46vs3615dxn7h18d"; + }; + + buildInputs = [ cmake pkgconfig ]; + + propagatedBuildInputs = [ libxml2 pcre ]; + + enableParallelBuilding = true; + + meta = { + description = "A library for handling the COLLADA file format"; + homepage = https://github.com/KhronosGroup/OpenCOLLADA/; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c287ca23986..0fb2f6d159e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6540,6 +6540,8 @@ let opencascade_oce = callPackage ../development/libraries/opencascade/oce.nix { }; + opencollada = callPackage ../development/libraries/opencollada { }; + opencsg = callPackage ../development/libraries/opencsg { }; openct = callPackage ../development/libraries/openct { }; |