diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 7d89339da102..e2af0b3f9338 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -64,7 +64,7 @@ openjpeg, openpgl, opensubdiv, - openvdb, + openvdb_11, openxr-loader, pkg-config, potrace, @@ -276,7 +276,7 @@ stdenv.mkDerivation (finalAttrs: { openjpeg openpgl (opensubdiv.override { inherit cudaSupport; }) - openvdb + openvdb_11 potrace pugixml python3 diff --git a/pkgs/development/libraries/openvdb/11.nix b/pkgs/development/libraries/openvdb/11.nix new file mode 100644 index 000000000000..a65bb286ae2e --- /dev/null +++ b/pkgs/development/libraries/openvdb/11.nix @@ -0,0 +1,19 @@ +{ + lib, + fetchFromGitHub, + openvdb, +}: + +openvdb.overrideAttrs (old: rec { + name = "${old.pname}-${version}"; + version = "11.0.0"; + src = fetchFromGitHub { + owner = "AcademySoftwareFoundation"; + repo = "openvdb"; + rev = "v${version}"; + sha256 = "sha256-wDDjX0nKZ4/DIbEX33PoxR43dJDj2NF3fm+Egug62GQ="; + }; + meta = old.meta // { + license = lib.licenses.mpl20; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b21dc2f649b8..2963ef53755a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22172,6 +22172,7 @@ with pkgs; zunclient = with python311Packages; toPythonApplication python-zunclient; openvdb = callPackage ../development/libraries/openvdb { }; + openvdb_11 = callPackage ../development/libraries/openvdb/11.nix { }; openvr = callPackage ../by-name/op/openvr/package.nix { inherit (darwin.apple_sdk.frameworks) Foundation AppKit;