From af1f03bc1347ae75ee80d9cb56feff0b77dbf5ae Mon Sep 17 00:00:00 2001 From: Ming-Chuan Date: Tue, 14 Apr 2026 17:50:25 -0700 Subject: [PATCH] blender: 5.1.0 -> 5.1.1 --- .../by-name/bl/blender/fix-quite-clog-warning.patch | 13 +++++++++++++ pkgs/by-name/bl/blender/package.nix | 7 +++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/bl/blender/fix-quite-clog-warning.patch diff --git a/pkgs/by-name/bl/blender/fix-quite-clog-warning.patch b/pkgs/by-name/bl/blender/fix-quite-clog-warning.patch new file mode 100644 index 000000000000..ff75af489244 --- /dev/null +++ b/pkgs/by-name/bl/blender/fix-quite-clog-warning.patch @@ -0,0 +1,13 @@ +diff --git a/source/blender/gpu/vulkan/vk_texture_pool.cc b/source/blender/gpu/vulkan/vk_texture_pool.cc +index 850e7808ae7..3478d4907f2 100644 +--- a/source/blender/gpu/vulkan/vk_texture_pool.cc ++++ b/source/blender/gpu/vulkan/vk_texture_pool.cc +@@ -554,7 +554,7 @@ void VKTexturePool::log_usage_data() + log_message += std::format(" ({} cached VkImages)", current_usage_data_.image_cache_size); + } + +- CLOG_TRACE(&LOG, log_message.c_str()); ++ CLOG_TRACE(&LOG, "%s", log_message.c_str()); + } + + } // namespace gpu diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index 91df7b38b283..fb2dcf6cbefe 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -118,12 +118,12 @@ in stdenv'.mkDerivation (finalAttrs: { pname = "blender"; - version = "5.1.0"; + version = "5.1.1"; src = fetchzip { name = "source"; url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz"; - hash = "sha256-knXAK3mW0tDz5ukuYkAZMv/zF9NLR8pofc3ujabcsys="; + hash = "sha256-iJolR8iS2go0doO96ibyseCeMunFL+XPoQ25NbX6oOA="; }; patches = [ @@ -131,6 +131,9 @@ stdenv'.mkDerivation (finalAttrs: { # ceres-solver dependency propagates eigen 3 and appears to be incompatible # with more recent versions. ./eigen-3-compat.patch + # Required due to `-Werror=format-security` in nixpkgs + # https://projects.blender.org/blender/blender/commit/470127ede2448de50a6936b8484b3c382c76d596 + ./fix-quite-clog-warning.patch ] # Minimal backport of hiprt 3.x support from https://projects.blender.org/blender/blender/pulls/144889 ++ lib.optionals rocmSupport [