From 69367e4ebcacd65b8e4fce52c80c7d6bda20c404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 18 Aug 2015 23:21:07 +0200 Subject: [PATCH] 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.) --- pkgs/applications/misc/blender/default.nix | 4 ++-- 1 file 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 =