diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-02 14:50:57 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-02 15:36:46 +0200 |
| commit | f3e2b312978c7e2ce0d1cb3a0ba0fd72e945f450 (patch) | |
| tree | 7b3a742e1e27ebc84e06005aa87035a12a3d220e /pkgs/applications/misc/blender | |
| parent | 24d922ec3a7c7125d1b26cd8d76f90d4a613cde2 (diff) | |
| download | nixlib-f3e2b312978c7e2ce0d1cb3a0ba0fd72e945f450.tar nixlib-f3e2b312978c7e2ce0d1cb3a0ba0fd72e945f450.tar.gz nixlib-f3e2b312978c7e2ce0d1cb3a0ba0fd72e945f450.tar.bz2 nixlib-f3e2b312978c7e2ce0d1cb3a0ba0fd72e945f450.tar.lz nixlib-f3e2b312978c7e2ce0d1cb3a0ba0fd72e945f450.tar.xz nixlib-f3e2b312978c7e2ce0d1cb3a0ba0fd72e945f450.tar.zst nixlib-f3e2b312978c7e2ce0d1cb3a0ba0fd72e945f450.zip | |
blender: Update to 2.75
(cherry picked from commit 36779d90e2b7e93ec5387cc5b5d106a037eb3d11)
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, 2 insertions, 16 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index b717f3044bcc..c0420d6ac675 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -10,15 +10,13 @@ with lib; stdenv.mkDerivation rec { - name = "blender-2.74"; + name = "blender-2.75"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "178i19pz7jl79b4wn92869j6qymawsa0kaw1dxaprbjnqsvcx8qc"; + sha256 = "1r3qyj57g06ir424q7szxkyb6h0b7laq7f126158kgs94xpkhlsz"; }; - patches = [ ./sm52.patch ]; - buildInputs = [ SDL boost cmake ffmpeg gettext glew ilmbase libXi libjpeg libpng libsamplerate libsndfile libtiff mesa openal diff --git a/pkgs/applications/misc/blender/sm52.patch b/pkgs/applications/misc/blender/sm52.patch deleted file mode 100644 index 7cb86c53bddb..000000000000 --- a/pkgs/applications/misc/blender/sm52.patch +++ /dev/null @@ -1,12 +0,0 @@ -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) |