Commit cc5ead2c authored by Andrew Marshall's avatar Andrew Marshall
Browse files

blender: 4.5.4 -> 5.0.0

parent 50a96edd

pkgs/by-name/bl/blender/fix-hip-path.patch

0 → 100644
+25 −0
Original line number Diff line number Diff line 
commit 0c7159ed66e28b4da4275cd79e01b2d0669808a3 (HEAD -> fix-hip-path-syntax-error, amarshall/fix-hip-path-syntax-error)

Author: Andrew Marshall <andrew@johnandrewmarshall.com>

Date:   Thu Nov 20 20:24:20 2025 -0500



    Fix: Incorrect HIP load path on Linux

    

    Missing comma meant the following line was concatenated with this one,

    causing the path to be

    "/opt/rocm/hip/lib/libamdhip64.so.6libamdhip64.so.7".

    

    Broken in 14bd7a531feddb81a0e522b7db76288639f1ad05.



diff --git a/extern/hipew/src/hipew.c b/extern/hipew/src/hipew.c

index 3ce13ef7c32..e72ccde69ef 100644

--- a/extern/hipew/src/hipew.c

+++ b/extern/hipew/src/hipew.c

@@ -244,7 +244,7 @@ static int hipewHipInit(void) {

   const char* hip_paths[] = { "libamdhip64.so",

                             "libamdhip64.so.6",

                             "/opt/rocm/lib/libamdhip64.so.6",

-                            "/opt/rocm/hip/lib/libamdhip64.so.6"

+                            "/opt/rocm/hip/lib/libamdhip64.so.6",

                             "libamdhip64.so.7",

                             "/opt/rocm/lib/libamdhip64.so.7",

                             "/opt/rocm/hip/lib/libamdhip64.so.7",

pkgs/by-name/bl/blender/package.nix

+8 −2
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ 
  pugixml,

  python3Packages, # must use instead of python3.pkgs, see https://github.com/NixOS/nixpkgs/issues/211340

  rocmPackages, # comes with a significantly larger closure size

  rubberband,

  runCommand,

  shaderc,

  spaceNavSupport ? stdenv.hostPlatform.isLinux,
@@ -116,14 +117,18 @@ in 


stdenv'.mkDerivation (finalAttrs: {

  pname = "blender";

  version = "4.5.4";

  version = "5.0.0";



  src = fetchzip {

    name = "source";

    url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";

    hash = "sha256-/cYMCWgojkO1mqzJ4BZwbwXPuBmg66T+gzpEuLiOskY=";

    hash = "sha256-UUHsylDmMWRcr1gGiXuYnno7D6uMjLqTYd9ak4FnZis=";

  };



  patches = [

    ./fix-hip-path.patch # https://projects.blender.org/blender/blender/pulls/150321

  ];



  postPatch =

    (lib.optionalString stdenv.hostPlatform.isDarwin ''

      : > build_files/cmake/platform/platform_apple_xcode.cmake
@@ -263,6 +268,7 @@ stdenv'.mkDerivation (finalAttrs: { 
    pugixml

    python3

    python3Packages.materialx

    rubberband

    zlib

    zstd

  ]