blender: fix build
- fetch upstream patch - update to python3.12 Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
This commit is contained in:
@@ -19,6 +19,7 @@
|
||||
darwin,
|
||||
dbus,
|
||||
embree,
|
||||
fetchpatch,
|
||||
fetchurl,
|
||||
fetchzip,
|
||||
ffmpeg,
|
||||
@@ -71,7 +72,7 @@
|
||||
pkg-config,
|
||||
potrace,
|
||||
pugixml,
|
||||
python311Packages, # must use instead of python3.pkgs, see https://github.com/NixOS/nixpkgs/issues/211340
|
||||
python3Packages, # must use instead of python3.pkgs, see https://github.com/NixOS/nixpkgs/issues/211340
|
||||
rocmPackages, # comes with a significantly larger closure size
|
||||
runCommand,
|
||||
spaceNavSupport ? stdenv.isLinux,
|
||||
@@ -86,7 +87,6 @@
|
||||
}:
|
||||
|
||||
let
|
||||
python3Packages = python311Packages;
|
||||
python3 = python3Packages.python;
|
||||
pyPkgsOpenusd = python3Packages.openusd.override { withOsl = false; };
|
||||
|
||||
@@ -111,7 +111,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-T7s69k0/hN9ccQN0hFQibBiFwawu1Tc9DOoegOgsCEg=";
|
||||
};
|
||||
|
||||
patches = [ ./draco.patch ] ++ lib.optional stdenv.isDarwin ./darwin.patch;
|
||||
patches = [
|
||||
./draco.patch
|
||||
(fetchpatch {
|
||||
url = "https://projects.blender.org/blender/blender/commit/ae35b5758791bebb21741f9b505b9fca347ae50e.patch";
|
||||
hash = "sha256-xUi55+7aiwEjtjqOi8to1YxdPlsBUThCCkCa5T6LIQc=";
|
||||
})
|
||||
] ++ lib.optional stdenv.isDarwin ./darwin.patch;
|
||||
|
||||
postPatch =
|
||||
(
|
||||
|
||||
Reference in New Issue
Block a user