blender: Add OpenCOLLADA support

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";
 

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;
+  };
+}

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 { };