public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blender: Support GeForce 9xx cards

This commit is contained in:
Eelco Dolstra 2015-03-02 00:22:22 +01:00
parent ea0d6a7fc0
commit 4a779f4d9a
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/blender/default.nix
View File

@ -3,7 +3,7 @@
, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python
, zlib, fftw , zlib, fftw
, jackaudioSupport ? false, jack2 , jackaudioSupport ? false, jack2
, cudaSupport ? false, cudatoolkit6 , cudaSupport ? false, cudatoolkit65
, colladaSupport ? true, opencollada , colladaSupport ? true, opencollada
}: }:
@ -17,13 +17,15 @@ stdenv.mkDerivation rec {
sha256 = "114ipidrja6ryi6wv0w55wmh10ikazy24r8js596g7b9fpkzpymc"; sha256 = "114ipidrja6ryi6wv0w55wmh10ikazy24r8js596g7b9fpkzpymc";
}; };
patches = [ ./sm52.patch ];
buildInputs = buildInputs =
[ SDL boost cmake ffmpeg gettext glew ilmbase libXi [ SDL boost cmake ffmpeg gettext glew ilmbase libXi
libjpeg libpng libsamplerate libsndfile libtiff mesa openal libjpeg libpng libsamplerate libsndfile libtiff mesa openal
opencolorio openexr openimageio /* openjpeg */ python zlib fftw opencolorio openexr openimageio /* openjpeg */ python zlib fftw
] ]
++ optional jackaudioSupport jack2 ++ optional jackaudioSupport jack2
++ optional cudaSupport cudatoolkit6 ++ optional cudaSupport cudatoolkit65
++ optional colladaSupport opencollada; ++ optional colladaSupport opencollada;
postUnpack = postUnpack =

12
pkgs/applications/misc/blender/sm52.patch Normal file
View File

@ -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)