diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2015-08-19 07:25:25 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2015-08-19 07:27:59 +0200 |
| commit | 13576925552b1d0751498fdda22e91a055a1ff6c (patch) | |
| tree | e53538438b5376eaa2a23507f0a430aa4f0c4967 /pkgs/applications/misc/blender/default.nix | |
| parent | d70c01daec57187ec19dcb8d39b686d8df6b0210 (diff) | |
| download | nixpkgs-13576925552b1d0751498fdda22e91a055a1ff6c.tar nixpkgs-13576925552b1d0751498fdda22e91a055a1ff6c.tar.gz nixpkgs-13576925552b1d0751498fdda22e91a055a1ff6c.tar.bz2 nixpkgs-13576925552b1d0751498fdda22e91a055a1ff6c.tar.lz nixpkgs-13576925552b1d0751498fdda22e91a055a1ff6c.tar.xz nixpkgs-13576925552b1d0751498fdda22e91a055a1ff6c.tar.zst nixpkgs-13576925552b1d0751498fdda22e91a055a1ff6c.zip | |
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).
Diffstat (limited to 'pkgs/applications/misc/blender/default.nix')
| -rw-r--r-- | pkgs/applications/misc/blender/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 1ccc2032284..bc4c97d1f21 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -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 = |