From 8ca6d3801ad85c989759f28270b43fd31ed12e8c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 23:39:50 +0000 Subject: [PATCH 1/2] blender: 2.83.0 -> 2.83.1 --- pkgs/applications/misc/blender/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index bf2a89ade55..42152d6e082 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -17,11 +17,11 @@ let python = python3Packages.python; in stdenv.mkDerivation rec { pname = "blender"; - version = "2.83.0"; + version = "2.83.1"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "07rzm4xaj94pjxy2vlqfhi1adsqpshfkrzrq8kljmcbnw22vrqhl"; + sha256 = "1kd74nzqvpcpsb4lghnjj9z3ps93lzqbhkv3lp5p79rqs8y64i23"; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; From 5760e275f4e9469a18e91d4bca1e956f5e777b66 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 30 Jun 2020 22:27:08 -0400 Subject: [PATCH 2/2] blender: don't require python3.7m on darwin python is currently pointing to the python38, so this patches the required version to match python version that is provided to the expression. The m prefix denotes the pymalloc ABI for python 3.7 and older, but is not provided starting python 3.8. --- pkgs/applications/misc/blender/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 42152d6e082..232ab1b2df0 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -57,6 +57,10 @@ stdenv.mkDerivation rec { --replace '${"$"}{LIBDIR}/python' \ '${python}' substituteInPlace build_files/cmake/platform/platform_apple.cmake \ + --replace 'set(PYTHON_VERSION 3.7)' \ + 'set(PYTHON_VERSION ${python.pythonVersion})' \ + --replace '${"$"}{PYTHON_VERSION}m' \ + '${"$"}{PYTHON_VERSION}' \ --replace '${"$"}{LIBDIR}/python' \ '${python}' \ --replace '${"$"}{LIBDIR}/opencollada' \