diff options
| author | Gabriel Ebner <gebner@gebner.org> | 2020-09-18 15:14:12 +0200 |
|---|---|---|
| committer | Gabriel Ebner <gebner@gebner.org> | 2020-09-18 15:19:57 +0200 |
| commit | 6b74f99abd2f4c62e8093cfbdb104f60661d5405 (patch) | |
| tree | c7fd26cf79a49f3e553a316b98af970f6041c01a /pkgs/applications/misc/blender/default.nix | |
| parent | 524755d323f8d8f5dd6c993bf4922b141d865367 (diff) | |
| download | nixpkgs-6b74f99abd2f4c62e8093cfbdb104f60661d5405.tar nixpkgs-6b74f99abd2f4c62e8093cfbdb104f60661d5405.tar.gz nixpkgs-6b74f99abd2f4c62e8093cfbdb104f60661d5405.tar.bz2 nixpkgs-6b74f99abd2f4c62e8093cfbdb104f60661d5405.tar.lz nixpkgs-6b74f99abd2f4c62e8093cfbdb104f60661d5405.tar.xz nixpkgs-6b74f99abd2f4c62e8093cfbdb104f60661d5405.tar.zst nixpkgs-6b74f99abd2f4c62e8093cfbdb104f60661d5405.zip | |
blender: 2.83.5 -> 2.90.0
Diffstat (limited to 'pkgs/applications/misc/blender/default.nix')
| -rw-r--r-- | pkgs/applications/misc/blender/default.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 2190307fbb5..2a28a4edc4f 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -9,6 +9,7 @@ , colladaSupport ? true, opencollada , makeWrapper , pugixml, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL +, embree }: with lib; @@ -17,11 +18,11 @@ let python = python3Packages.python; in stdenv.mkDerivation rec { pname = "blender"; - version = "2.83.5"; + version = "2.90.0"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "0xyawly00a59hfdb6b7va84k5fhcv2mxnzd77vs22bzi9y7sap43"; + sha256 = "08qkvgdfrqh4ljqw5m64bbki1dsfcs4xnwzq6829z3ddhiwrxw84"; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; @@ -35,6 +36,7 @@ stdenv.mkDerivation rec { (opensubdiv.override { inherit cudaSupport; }) tbb makeWrapper + embree ] ++ (if (!stdenv.isDarwin) then [ libXi libX11 libXext libXrender @@ -50,8 +52,11 @@ stdenv.mkDerivation rec { ++ optional cudaSupport cudatoolkit ++ optional colladaSupport opencollada; - postPatch = - if stdenv.isDarwin then '' + postPatch = '' + # allow usage of dynamically linked embree + rm build_files/cmake/Modules/FindEmbree.cmake + '' + + (if stdenv.isDarwin then '' : > build_files/cmake/platform/platform_apple_xcode.cmake substituteInPlace source/creator/CMakeLists.txt \ --replace '${"$"}{LIBDIR}/python' \ @@ -77,7 +82,7 @@ stdenv.mkDerivation rec { 'set(OPENEXR_INCLUDE_DIRS "${openexr.dev}/include/OpenEXR") #' '' else '' substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"' - ''; + ''); cmakeFlags = [ |