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

Merge pull request #104934 from tilpner/blender-update

Browse Source 
blender: 2.90.1 -> 2.91.0
This commit is contained in:
Maximilian Bosch 2020-11-26 12:52:12 +01:00 committed by GitHub
commit 9f61ae8e67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@
, colladaSupport ? true, opencollada , colladaSupport ? true, opencollada
, makeWrapper , makeWrapper
, pugixml, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL , pugixml, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL
, embree , embree, gmp
}: }:
with lib; with lib;
@ -18,11 +18,11 @@ let python = python3Packages.python; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "blender"; pname = "blender";
version = "2.90.1"; version = "2.91.0";
src = fetchurl { src = fetchurl {
url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; url = "https://download.blender.org/source/${pname}-${version}.tar.xz";
sha256 = "169xcmm1zkvab14qdxggqc758xdkqs7r7imwi6yx2fl2djacr3g7"; sha256 = "0x396lgmk0dq9115yrc36s8zwxzmjr490sr5n2y6w27y17yllyjm";
}; };
patches = lib.optional stdenv.isDarwin ./darwin.patch; patches = lib.optional stdenv.isDarwin ./darwin.patch;
@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
tbb tbb
makeWrapper makeWrapper
embree embree
gmp
] ]
++ (if (!stdenv.isDarwin) then [ ++ (if (!stdenv.isDarwin) then [
libXi libX11 libXext libXrender libXi libX11 libXext libXrender