diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-03-02 00:22:22 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-03-02 00:24:04 +0100 |
| commit | 4a779f4d9a5b85e227a94b6b3bc5f866e8c38aaa (patch) | |
| tree | b790f973a43809457177c4aa7b1ca43785c1b45e /pkgs/applications/misc/blender | |
| parent | ea0d6a7fc0c77e3c34a66258ba066c8516e93b50 (diff) | |
| download | nixlib-4a779f4d9a5b85e227a94b6b3bc5f866e8c38aaa.tar nixlib-4a779f4d9a5b85e227a94b6b3bc5f866e8c38aaa.tar.gz nixlib-4a779f4d9a5b85e227a94b6b3bc5f866e8c38aaa.tar.bz2 nixlib-4a779f4d9a5b85e227a94b6b3bc5f866e8c38aaa.tar.lz nixlib-4a779f4d9a5b85e227a94b6b3bc5f866e8c38aaa.tar.xz nixlib-4a779f4d9a5b85e227a94b6b3bc5f866e8c38aaa.tar.zst nixlib-4a779f4d9a5b85e227a94b6b3bc5f866e8c38aaa.zip | |
blender: Support GeForce 9xx cards
Diffstat (limited to 'pkgs/applications/misc/blender')
| -rw-r--r-- | pkgs/applications/misc/blender/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/misc/blender/sm52.patch | 12 |
2 files changed, 16 insertions, 2 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 982c0d618d52..3a86c282193d 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, jack2 -, cudaSupport ? false, cudatoolkit6 +, cudaSupport ? false, cudatoolkit65 , colladaSupport ? true, opencollada }: @@ -17,13 +17,15 @@ stdenv.mkDerivation rec { sha256 = "114ipidrja6ryi6wv0w55wmh10ikazy24r8js596g7b9fpkzpymc"; }; + patches = [ ./sm52.patch ]; + buildInputs = [ SDL boost cmake ffmpeg gettext glew ilmbase libXi libjpeg libpng libsamplerate libsndfile libtiff mesa openal opencolorio openexr openimageio /* openjpeg */ python zlib fftw ] ++ optional jackaudioSupport jack2 - ++ optional cudaSupport cudatoolkit6 + ++ optional cudaSupport cudatoolkit65 ++ optional colladaSupport opencollada; postUnpack = diff --git a/pkgs/applications/misc/blender/sm52.patch b/pkgs/applications/misc/blender/sm52.patch new file mode 100644 index 000000000000..7cb86c53bddb --- /dev/null +++ b/pkgs/applications/misc/blender/sm52.patch @@ -0,0 +1,12 @@ +diff -ru -x '*~' blender-2.73a-orig/CMakeLists.txt blender-2.73a/CMakeLists.txt +--- blender-2.73a-orig/CMakeLists.txt 2015-01-21 13:31:24.000000000 +0100 ++++ blender-2.73a/CMakeLists.txt 2015-03-01 23:14:22.962585422 +0100 +@@ -351,7 +351,7 @@ + option(WITH_CYCLES_STANDALONE_GUI "Build cycles standalone with GUI" OFF) + option(WITH_CYCLES_OSL "Build Cycles with OSL support" ${_init_CYCLES_OSL}) + option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF) +-set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 sm_50 CACHE STRING "CUDA architectures to build binaries for") ++set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 sm_50 sm_52 CACHE STRING "CUDA architectures to build binaries for") + mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH) + unset(PLATFORM_DEFAULT) + option(WITH_CYCLES_LOGGING "Build cycles with logging support" ON) |