public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

opensubdiv: 3.0.5 -> 3.2.0 

Also remove cudatoolkit override as we have cudatoolkit = cudatoolkit8 now.
This commit is contained in:
Nikolay Amiantov 2017-02-28 17:16:01 +03:00
parent 044a49febf
commit d7ecf89580
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/development/libraries/opensubdiv/default.nix
View File

@ -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 , cudaSupport ? false, cudatoolkit
}: }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "opensubdiv-3.0.5"; name = "opensubdiv-${version}";
version = "3.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PixarAnimationStudios"; owner = "PixarAnimationStudios";
repo = "OpenSubdiv"; repo = "OpenSubdiv";
rev = "v3_0_5"; rev = "v${lib.replaceChars ["."] ["_"] version}";
sha256 = "16xv4cw1k75wgd4ddr0sa87wd46ygbn2k2avh9c1mfd405p80d92"; sha256 = "0wk12n1s8za3sz8d6bmfm3rfjyx20j48gy1xp57dvbnjvlvzqy3w";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
patches =
[ # Fix for building with cudatoolkit 7.
(fetchurl {
url = "https://github.com/opeca64/OpenSubdiv/commit/c3c258d00feaeffe1123f6077179c155e71febfb.patch";
sha256 = "0vazhp35v8vsgnvprkzwvfkbalr0kzcwlin9ygyfb77cz7mwicnf";
})
];
buildInputs = 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. # 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; ++ lib.optional cudaSupport cudatoolkit;

3
pkgs/top-level/all-packages.nix
View File

@ -9140,7 +9140,7 @@ with pkgs;
}; };
opensubdiv = callPackage ../development/libraries/opensubdiv { opensubdiv = callPackage ../development/libraries/opensubdiv {
cudatoolkit = cudatoolkit8; cmake = cmake_2_8;
}; };
openwsman = callPackage ../development/libraries/openwsman {}; openwsman = callPackage ../development/libraries/openwsman {};
@ -12794,7 +12794,6 @@ with pkgs;
bleachbit = callPackage ../applications/misc/bleachbit { }; bleachbit = callPackage ../applications/misc/bleachbit { };
blender = callPackage ../applications/misc/blender { blender = callPackage ../applications/misc/blender {
cudatoolkit = cudatoolkit8;
python = python35; python = python35;
}; };