From 67c5a83f65f7c2bb2dc6b118242cee5506a6e6ed Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sun, 29 Dec 2024 09:13:43 +0100 Subject: [PATCH] python312Packages.openusd: fix build on darwin Due to an update to Clang 19 the compiler got stricter and will fail with ``` error: no member named '_Set' in 'SdfChildrenProxy<_View>' ``` Upstream has merged an fix, which this commit will pull Signed-off-by: Florian Brandes --- pkgs/development/python-modules/openusd/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index c9e0213dce4e5..959014e2513b8 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -74,6 +74,19 @@ buildPythonPackage rec { url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/c8fec1342e05dca98a1afd4ea93c7a5f0b41e25b.patch?full_index=1"; hash = "sha256-pK1TUwmVv9zsZkOypq25pl+FJDxJJvozUtVP9ystGtI="; }) + # https://github.com/PixarAnimationStudios/OpenUSD/issues/3442 + # https://github.com/PixarAnimationStudios/OpenUSD/pull/3434 commit 1 + (fetchpatch { + name = "explicitly-adding-template-keyword.patch"; + url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/274cf7c6fe1c121d095acd38dd1a33214e0c8448.patch?full_index=1"; + hash = "sha256-nlw7o2jVWV9f1Lzl32UXcRVXcWnfyMNv9Mp4SVgFvyw="; + }) + # https://github.com/PixarAnimationStudios/OpenUSD/pull/3434 commit 2 + (fetchpatch { + name = "fix-removes-unused-path.patch"; + url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/5a6437e44269534bfde0c35cc2c7bdef087b70e8.patch?full_index=1"; + hash = "sha256-X2v14U0pJjd4IMD8viXK2/onVFqUabJTXwDGRFKDZ+g="; + }) ]; env.OSL_LOCATION = "${osl}";