Merge: use Python 3.3 as the default version of Python3

4 files changed, 78 insertions, 8 deletions

diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix
new file mode 100644
index 000000000000..fa7d16ccf0a7
--- /dev/null
+++ b/pkgs/applications/graphics/openimageio/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, boost, cmake, ilmbase, libjpeg, libpng, libtiff
+, opencolorio, openexr, unzip
+}:
+
+stdenv.mkDerivation rec {
+  name = "oiio-${version}";
+  version = "1.1.8";
+
+  src = fetchurl {
+    url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip";
+    sha256 = "08a6qhplzs8kianqb1gjgrndg81h3il5531jn9g6i4940b1xispg";
+  };
+
+  buildInputs = [ 
+    boost cmake ilmbase libjpeg libpng libtiff opencolorio openexr unzip
+  ];
+
+  configurePhase = "";
+
+  buildPhase = ''
+    make ILMBASE_HOME=${ilmbase} OPENEXR_HOME=${openexr} USE_PYTHON=0 \
+      INSTALLDIR=$out dist_dir=
+  '';
+
+  installPhase = ":";
+
+  meta = with stdenv.lib; {
+    homepage = http://www.openimageio.org;
+    description = "A library and tools for reading and writing images";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 828d55ad4789..1ed51a81f5cc 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -1,26 +1,37 @@
-{ stdenv, fetchurl, SDL, cmake, gettext, ilmbase, libXi, libjpeg,
-libpng, libsamplerate, libtiff, mesa, openal, openexr, openjpeg,
-python, zlib, boost }:
+{ stdenv, fetchurl, SDL, boost, cmake, ffmpeg, gettext, glew
+, ilmbase, jackaudio, libXi, libjpeg, libpng, libsamplerate, libsndfile
+, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python
+, zlib
+}:
 
 stdenv.mkDerivation rec {
-  name = "blender-2.63a";
+  name = "blender-2.66a";
 
   src = fetchurl {
     url = "http://download.blender.org/source/${name}.tar.gz";
-    sha256 = "c479b1abfe5fd8a1a5d04b8d21fdbc0fc960d7855b24785b888c09792bca4c1a";
+    sha256 = "0wj8x9xk5irvsjc3rm7wzml1j47xcdpdpy84kidafk02biskcqcb";
   };
 
-  buildInputs = [ cmake mesa gettext python libjpeg libpng zlib openal
-    SDL openexr libsamplerate libXi libtiff ilmbase openjpeg boost ];
+  buildInputs = [
+    SDL boost cmake ffmpeg gettext glew ilmbase jackaudio libXi
+    libjpeg libpng libsamplerate libsndfile libtiff mesa openal
+    opencolorio openexr openimageio openjpeg python zlib
+  ];
+
 
   cmakeFlags = [
     "-DOPENEXR_INC=${openexr}/include/OpenEXR"
     "-DWITH_OPENCOLLADA=OFF"
+    "-DWITH_CODEC_FFMPEG=ON"
+    "-DWITH_CODEC_SNDFILE=ON"
+    "-DWITH_JACK=ON"
     "-DWITH_INSTALL_PORTABLE=OFF"
+    "-DPYTHON_LIBRARY=python${python.majorVersion}m"    
     "-DPYTHON_LIBPATH=${python}/lib"
+    "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m"
   ];
 
-  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}";
+  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}m";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix
new file mode 100644
index 000000000000..513b340e132a
--- /dev/null
+++ b/pkgs/development/libraries/opencolorio/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, cmake, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "ocio-${version}";
+  version = "1.0.8";
+
+  src = fetchurl {
+    url = "https://github.com/imageworks/OpenColorIO/archive/v1.0.8.zip";
+    sha256 = "1l70bf40dz2znm9rh3r6xs9d6kp719y1djayb7dc89khfqqbx2di";
+  };
+
+  buildInputs = [ cmake unzip ];
+
+  meta = with stdenv.lib; {
+    homepage = http://opencolorio.org;
+    description = "A color management framework for visual effects and animation";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09365a80cf1c..c75a98a6f24d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4712,6 +4712,8 @@ let
     opensc = opensc_0_11_7;
   };
 
+  opencolorio = callPackage ../development/libraries/opencolorio { };
+
   ois = callPackage ../development/libraries/ois {};
 
   opal = callPackage ../development/libraries/opal {};
@@ -7543,6 +7545,8 @@ let
 
   openbox = callPackage ../applications/window-managers/openbox { };
 
+  openimageio = callPackage ../applications/graphics/openimageio { };
+
   openjump = callPackage ../applications/misc/openjump { };
 
   openscad = callPackage ../applications/graphics/openscad {};