From d7ecf89580f4b50842f64bdfd86220accbbc0616 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 28 Feb 2017 17:16:01 +0300
Subject: [PATCH] opensubdiv: 3.0.5 -> 3.2.0

Also remove cudatoolkit override as we have cudatoolkit = cudatoolkit8 now.
---
 .../libraries/opensubdiv/default.nix          | 25 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  3 +--
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix
index b253a27a7db3..e91fd0e60ffd 100644
--- a/pkgs/development/libraries/opensubdiv/default.nix
+++ b/pkgs/development/libraries/opensubdiv/default.nix
@@ -1,31 +1,26 @@
-{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, mesa_glu, mesa_noglu, glew
+{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, mesa_glu
+, mesa_noglu, glew, ocl-icd, python3
 , cudaSupport ? false, cudatoolkit
 }:
 
-stdenv.mkDerivation {
-  name = "opensubdiv-3.0.5";
+stdenv.mkDerivation rec {
+  name = "opensubdiv-${version}";
+  version = "3.2.0";
 
   src = fetchFromGitHub {
     owner = "PixarAnimationStudios";
     repo = "OpenSubdiv";
-    rev = "v3_0_5";
-    sha256 = "16xv4cw1k75wgd4ddr0sa87wd46ygbn2k2avh9c1mfd405p80d92";
+    rev = "v${lib.replaceChars ["."] ["_"] version}";
+    sha256 = "0wk12n1s8za3sz8d6bmfm3rfjyx20j48gy1xp57dvbnjvlvzqy3w";
   };
 
   outputs = [ "out" "dev" ];
 
-  patches =
-    [ # Fix for building with cudatoolkit 7.
-      (fetchurl {
-        url = "https://github.com/opeca64/OpenSubdiv/commit/c3c258d00feaeffe1123f6077179c155e71febfb.patch";
-        sha256 = "0vazhp35v8vsgnvprkzwvfkbalr0kzcwlin9ygyfb77cz7mwicnf";
-      })
-    ];
-
   buildInputs =
-    [ cmake pkgconfig mesa_glu mesa_noglu
+    [ cmake pkgconfig mesa_glu mesa_noglu ocl-icd python3
       # FIXME: these are not actually needed, but the configure script wants them.
-      glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor xorg.libXinerama
+      glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor
+      xorg.libXinerama xorg.libXi
     ]
     ++ lib.optional cudaSupport cudatoolkit;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e70ebe4cc7f3..90037d302697 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9140,7 +9140,7 @@ with pkgs;
   };
 
   opensubdiv = callPackage ../development/libraries/opensubdiv {
-    cudatoolkit = cudatoolkit8;
+    cmake = cmake_2_8;
   };
 
   openwsman = callPackage ../development/libraries/openwsman {};
@@ -12794,7 +12794,6 @@ with pkgs;
   bleachbit = callPackage ../applications/misc/bleachbit { };
 
   blender = callPackage  ../applications/misc/blender {
-    cudatoolkit = cudatoolkit8;
     python = python35;
   };