diff --git a/pkgs/development/python-modules/materialx/default.nix b/pkgs/development/python-modules/materialx/default.nix index ac858b468fdd..4e47efbb27ce 100644 --- a/pkgs/development/python-modules/materialx/default.nix +++ b/pkgs/development/python-modules/materialx/default.nix @@ -8,7 +8,7 @@ libX11, libXt, libGL, - openimageio_2, + openimageio, imath, python, apple-sdk_14, @@ -16,16 +16,13 @@ buildPythonPackage rec { pname = "materialx"; - version = "1.38.10"; + version = "1.39.3"; - # nixpkgs-update: no auto update - # Updates are disabled due to API breakage in 1.39+ that breaks almost all - # consumers. src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "MaterialX"; rev = "v${version}"; - hash = "sha256-/kMHmW2dptZNtjuhE5s+jvPRIdtY+FRiVtMU+tiBgQo="; + hash = "sha256-ceVYD/dyb3SEEENoJZxjn94DGmUj6IYSNLjsJvmPM84="; }; format = "other"; @@ -36,7 +33,7 @@ buildPythonPackage rec { ]; buildInputs = [ - openimageio_2 + openimageio imath ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ @@ -50,6 +47,7 @@ buildPythonPackage rec { cmakeFlags = [ (lib.cmakeBool "MATERIALX_BUILD_OIIO" true) + (lib.cmakeBool "MATERIALX_BUILD_SHARED_LIBS" true) (lib.cmakeBool "MATERIALX_BUILD_PYTHON" true) (lib.cmakeBool "MATERIALX_BUILD_GEN_MSL" ( stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin @@ -66,12 +64,6 @@ buildPythonPackage rec { ln -s $out/python $target_dir ''; - # Update to 1.39 has major API changes and downstream software - # needs to adapt, first. So, do not include in mass updates. For reference, see - # https://github.com/NixOS/nixpkgs/pull/326466#issuecomment-2293029160 - # and https://github.com/NixOS/nixpkgs/issues/380230 - passthru.skipBulkUpdate = true; - meta = { changelog = "https://github.com/AcademySoftwareFoundation/MaterialX/blob/${src.rev}/CHANGELOG.md"; description = "Open standard for representing rich material and look-development content in computer graphics";