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

blender: take unversioned cudatoolkit attr

Browse Source 
Makes it less weird to do an override, if a user wants to use e.g. cuda
6.5 (also requires gcc 4.8).
This commit is contained in:
Bjørn Forsman 2015-08-19 07:25:25 +02:00
parent d70c01daec
commit 1357692555
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/blender/default.nix
View File

@ -3,7 +3,7 @@
, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python
, zlib, fftw , zlib, fftw
, jackaudioSupport ? false, libjack2 , jackaudioSupport ? false, libjack2
, cudaSupport ? false, cudatoolkit7 , cudaSupport ? false, cudatoolkit
, colladaSupport ? true, opencollada , colladaSupport ? true, opencollada
}: }:
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
opencolorio openexr openimageio /* openjpeg */ python zlib fftw opencolorio openexr openimageio /* openjpeg */ python zlib fftw
] ]
++ optional jackaudioSupport libjack2 ++ optional jackaudioSupport libjack2
++ optional cudaSupport cudatoolkit7 ++ optional cudaSupport cudatoolkit
++ optional colladaSupport opencollada; ++ optional colladaSupport opencollada;
postUnpack = postUnpack =

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

@ -10835,6 +10835,7 @@ let
bleachbit = callPackage ../applications/misc/bleachbit { }; bleachbit = callPackage ../applications/misc/bleachbit { };
blender = callPackage ../applications/misc/blender { blender = callPackage ../applications/misc/blender {
cudatoolkit = cudatoolkit7;
python = python34; python = python34;
}; };