diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
| commit | 5423cabbbf2b6dec5568f1ecabd288d5d9a642ec (patch) | |
| tree | f316a6a921bfefd3a63bd4502c2eb50ff1644f67 /nixpkgs/pkgs/applications/misc/blender/default.nix | |
| parent | 46a88117a05c3469af5d99433af140c3de8ca088 (diff) | |
| parent | 8aa81f34981add12aecada6c702ddbbd0375ca36 (diff) | |
| download | nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.gz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.bz2 nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.lz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.xz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.zst nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/blender/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/misc/blender/default.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/applications/misc/blender/default.nix b/nixpkgs/pkgs/applications/misc/blender/default.nix index ebbc6cc84fef..c0fb3b336d0f 100644 --- a/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/nixpkgs/pkgs/applications/misc/blender/default.nix @@ -84,6 +84,7 @@ let python3Packages = python310Packages; python3 = python3Packages.python; + pyPkgsOpenusd = python3Packages.openusd.override { withOsl = false; }; libdecor' = libdecor.overrideAttrs (old: { # Blender uses private APIs, need to patch to expose them @@ -112,6 +113,11 @@ stdenv.mkDerivation (finalAttrs: { url = "https://projects.blender.org/blender/blender/commit/cf4365e555a759d5b3225bce77858374cb07faad.diff"; hash = "sha256-Nypd04yFSHYa7RBa8kNmoApqJrU4qpaOle3tkj44d4g="; }) + (fetchpatch { + # https://projects.blender.org/blender/blender/issues/117145 + url = "https://projects.blender.org/blender/blender/commit/eb99895c972b6c713294f68a34798aa51d36034a.patch"; + hash = "sha256-95nG5mW408lhKJ2BppgaUwBMMeXeGyBqho6mCfB53GI="; + }) ] ++ lib.optional stdenv.isDarwin ./darwin.patch; postPatch = @@ -166,6 +172,7 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_PYTHON_INSTALL_REQUESTS=OFF" "-DWITH_SDL=OFF" "-DWITH_TBB=ON" + "-DWITH_USD=ON" # Blender supplies its own FindAlembic.cmake (incompatible with the Alembic-supplied config file) "-DALEMBIC_INCLUDE_DIR=${lib.getDev alembic}/include" @@ -232,6 +239,7 @@ stdenv.mkDerivation (finalAttrs: { (opensubdiv.override { inherit cudaSupport; }) potrace pugixml + pyPkgsOpenusd python3 tbb zlib @@ -287,6 +295,7 @@ stdenv.mkDerivation (finalAttrs: { ps.numpy ps.requests ps.zstandard + pyPkgsOpenusd ]; blenderExecutable = |