diff options
author | Nikolay Amiantov <ab@fmap.me> | 2017-02-28 17:16:01 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2017-02-28 17:22:06 +0300 |
commit | d7ecf89580f4b50842f64bdfd86220accbbc0616 (patch) | |
tree | 68caa7579c609891fa72db5b631fbcfc44ef83a7 /pkgs/development/libraries/opensubdiv | |
parent | 044a49febf11ff08fa4bbdee49e110d13ac423cd (diff) | |
download | nixlib-d7ecf89580f4b50842f64bdfd86220accbbc0616.tar nixlib-d7ecf89580f4b50842f64bdfd86220accbbc0616.tar.gz nixlib-d7ecf89580f4b50842f64bdfd86220accbbc0616.tar.bz2 nixlib-d7ecf89580f4b50842f64bdfd86220accbbc0616.tar.lz nixlib-d7ecf89580f4b50842f64bdfd86220accbbc0616.tar.xz nixlib-d7ecf89580f4b50842f64bdfd86220accbbc0616.tar.zst nixlib-d7ecf89580f4b50842f64bdfd86220accbbc0616.zip |
opensubdiv: 3.0.5 -> 3.2.0
Also remove cudatoolkit override as we have cudatoolkit = cudatoolkit8 now.
Diffstat (limited to 'pkgs/development/libraries/opensubdiv')
-rw-r--r-- | pkgs/development/libraries/opensubdiv/default.nix | 25 |
1 files changed, 10 insertions, 15 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; |