From 13576925552b1d0751498fdda22e91a055a1ff6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 19 Aug 2015 07:25:25 +0200
Subject: [PATCH] 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).
---
 pkgs/applications/misc/blender/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix            | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 1ccc20322844..bc4c97d1f213 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 =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 29038081ad44..47bc0bb85b87 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10835,6 +10835,7 @@ let
   bleachbit = callPackage ../applications/misc/bleachbit { };
 
   blender = callPackage  ../applications/misc/blender {
+    cudatoolkit = cudatoolkit7;
     python = python34;
   };