diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-27 15:09:19 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-27 15:09:19 +0100 |
commit | b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf (patch) | |
tree | 220c385a8657d85bb6b305819a1842a3b1f4079c /pkgs/applications/misc/blender/default.nix | |
parent | 977848375167f4671a03ccc0dbf5896f4cf0d3fe (diff) | |
parent | be36f6f0a0ffbeef228a021f5a343f5ce7a183de (diff) | |
download | nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.gz nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.bz2 nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.lz nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.xz nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.zst nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/misc/blender/default.nix')
-rw-r--r-- | pkgs/applications/misc/blender/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 17f0ffdb92c..718765e6efe 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -9,7 +9,7 @@ , colladaSupport ? true, opencollada , makeWrapper , pugixml, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL -, embree +, embree, gmp }: with lib; @@ -18,11 +18,11 @@ let python = python3Packages.python; in stdenv.mkDerivation rec { pname = "blender"; - version = "2.90.1"; + version = "2.91.0"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "169xcmm1zkvab14qdxggqc758xdkqs7r7imwi6yx2fl2djacr3g7"; + sha256 = "0x396lgmk0dq9115yrc36s8zwxzmjr490sr5n2y6w27y17yllyjm"; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { tbb makeWrapper embree + gmp ] ++ (if (!stdenv.isDarwin) then [ libXi libX11 libXext libXrender |