diff options
author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2015-08-18 23:21:07 +0200 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2015-08-18 23:22:06 +0200 |
commit | 69367e4ebcacd65b8e4fce52c80c7d6bda20c404 (patch) | |
tree | 85e6d583f6135b83e3685a452872d651570e2a12 /pkgs/applications/misc/blender | |
parent | 848c1a72b2ab1912bce19d06a750920afbe99df4 (diff) | |
download | nixlib-69367e4ebcacd65b8e4fce52c80c7d6bda20c404.tar nixlib-69367e4ebcacd65b8e4fce52c80c7d6bda20c404.tar.gz nixlib-69367e4ebcacd65b8e4fce52c80c7d6bda20c404.tar.bz2 nixlib-69367e4ebcacd65b8e4fce52c80c7d6bda20c404.tar.lz nixlib-69367e4ebcacd65b8e4fce52c80c7d6bda20c404.tar.xz nixlib-69367e4ebcacd65b8e4fce52c80c7d6bda20c404.tar.zst nixlib-69367e4ebcacd65b8e4fce52c80c7d6bda20c404.zip |
blender: unbreak cudaSupport
Currently it errors out at build time with: /nix/store/HASH-cudatoolkit-6.5.19/usr_include/host_config.h:82:2: error: #error -- unsupported GNU version! gcc 4.9 and up are not supported! Instead of downgrading gcc to 4.8, this patch upgrades cuda to 7.0, which I think is the better choice. (Cuda 7 dropped support for some older graphics cards, but gained support for newer ones.)
Diffstat (limited to 'pkgs/applications/misc/blender')
-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 01299dc671dd..1ccc20322844 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, cudatoolkit65 +, cudaSupport ? false, cudatoolkit7 , colladaSupport ? true, opencollada }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { opencolorio openexr openimageio /* openjpeg */ python zlib fftw ] ++ optional jackaudioSupport libjack2 - ++ optional cudaSupport cudatoolkit65 + ++ optional cudaSupport cudatoolkit7 ++ optional colladaSupport opencollada; postUnpack = |