about summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorPol Dellaiera <pol.dellaiera@protonmail.com>2024-03-12 21:50:20 +0100
committerGitHub <noreply@github.com>2024-03-12 21:50:20 +0100
commit676b13ca3a18336fefa5c32eaab83e1259c28a21 (patch)
treea360a75727a76f9fdf26d53fea9d3baa512dbe6d /pkgs/applications
parentd3f42df5c978f1278d0581d366a619dc3c78d5e3 (diff)
parentcaa0d575c838e33732fb5ff70f12a06a29c46cc3 (diff)
downloadnixlib-676b13ca3a18336fefa5c32eaab83e1259c28a21.tar
nixlib-676b13ca3a18336fefa5c32eaab83e1259c28a21.tar.gz
nixlib-676b13ca3a18336fefa5c32eaab83e1259c28a21.tar.bz2
nixlib-676b13ca3a18336fefa5c32eaab83e1259c28a21.tar.lz
nixlib-676b13ca3a18336fefa5c32eaab83e1259c28a21.tar.xz
nixlib-676b13ca3a18336fefa5c32eaab83e1259c28a21.tar.zst
nixlib-676b13ca3a18336fefa5c32eaab83e1259c28a21.zip
Merge pull request #295361 from amarshall/blender-fix-oiio-2.5
blender: fix incompat with OpenImageIO 2.5+ causing incorrect renders
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/misc/blender/default.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index ebbc6cc84fef..2a3a359b4304 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -112,6 +112,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 =