blender: take unversioned cudatoolkit attr
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:
parent
d70c01daec
commit
1357692555
|
@ -3,7 +3,7 @@
|
|||
, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python
|
||||
, zlib, fftw
|
||||
, jackaudioSupport ? false, libjack2
|
||||
, cudaSupport ? false, cudatoolkit7
|
||||
, cudaSupport ? false, cudatoolkit
|
||||
, colladaSupport ? true, opencollada
|
||||
}:
|
||||
|
||||
|
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
|||
opencolorio openexr openimageio /* openjpeg */ python zlib fftw
|
||||
]
|
||||
++ optional jackaudioSupport libjack2
|
||||
++ optional cudaSupport cudatoolkit7
|
||||
++ optional cudaSupport cudatoolkit
|
||||
++ optional colladaSupport opencollada;
|
||||
|
||||
postUnpack =
|
||||
|
|
|
@ -10835,6 +10835,7 @@ let
|
|||
bleachbit = callPackage ../applications/misc/bleachbit { };
|
||||
|
||||
blender = callPackage ../applications/misc/blender {
|
||||
cudatoolkit = cudatoolkit7;
|
||||
python = python34;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue