diff options
| author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2023-07-11 11:49:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-11 11:49:31 +0200 |
| commit | 94820b98ea7422ef885fecf532d6e143d715c3f6 (patch) | |
| tree | 4a4409047c4604d435c94eb78066d086432a6fae | |
| parent | c3bdda1bac5b893ef7c9a5152bdc0bf45c3d518f (diff) | |
| parent | db9ff9eb8a5a60b9484e7780684bb0e89c471224 (diff) | |
| download | nixpkgs-94820b98ea7422ef885fecf532d6e143d715c3f6.tar nixpkgs-94820b98ea7422ef885fecf532d6e143d715c3f6.tar.gz nixpkgs-94820b98ea7422ef885fecf532d6e143d715c3f6.tar.bz2 nixpkgs-94820b98ea7422ef885fecf532d6e143d715c3f6.tar.lz nixpkgs-94820b98ea7422ef885fecf532d6e143d715c3f6.tar.xz nixpkgs-94820b98ea7422ef885fecf532d6e143d715c3f6.tar.zst nixpkgs-94820b98ea7422ef885fecf532d6e143d715c3f6.zip | |
Merge pull request #242665 from amarshall/blender-3.6
blender: 3.5.1 -> 3.6.0
| -rw-r--r-- | pkgs/applications/misc/blender/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index cc1252899b5..81b7a54a754 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -28,11 +28,11 @@ let in stdenv.mkDerivation rec { pname = "blender"; - version = "3.5.1"; + version = "3.6.0"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - hash = "sha256-vXQox+bLpakAIWJpwyER3/qrrxvbVHLyMZZeYVF0qAk="; + hash = "sha256-SzdWyzdGhsaesv1VX5ZUfUnLHvRvW8buJTlOVxz6yOk="; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; @@ -80,8 +80,6 @@ stdenv.mkDerivation rec { pythonPath = with python310Packages; [ numpy requests ]; 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 |