diff options
Diffstat (limited to 'pkgs/development/python-modules/openusd/default.nix')
-rw-r--r-- | pkgs/development/python-modules/openusd/default.nix | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index f281bc352d1b..f44a712aaf80 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -51,26 +51,27 @@ in buildPythonPackage rec { pname = "openusd"; - version = "24.05"; + version = "24.08"; + pyproject = false; src = fetchFromGitHub { owner = "PixarAnimationStudios"; repo = "OpenUSD"; rev = "refs/tags/v${version}"; - hash = "sha256-akwLIB5YUbnDiaQXX/K5YLXzWlTYWZG51dtxbSFxPt0="; + hash = "sha256-slBJleeDi0mCVThty4NUX4M9vaCLV+E8rnp1Ab77TmE="; }; - stdenv = if python.stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv; + stdenv = + if python.stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv; outputs = [ "out" ] ++ lib.optional withDocs "doc"; - format = "other"; - patches = [ (fetchpatch { name = "port-to-embree-4.patch"; - url = "https://github.com/PixarAnimationStudios/OpenUSD/pull/2266/commits/4b6c23d459c602fdac5e0ebc9b7722cbd5475e86.patch"; - hash = "sha256-yjqdGAVqfEsOX1W/tG6c+GgQLYya5U9xgUe/sNIuDbw="; + # https://github.com/PixarAnimationStudios/OpenUSD/pull/2266 + url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/c8fec1342e05dca98a1afd4ea93c7a5f0b41e25b.patch?full_index=1"; + hash = "sha256-pK1TUwmVv9zsZkOypq25pl+FJDxJJvozUtVP9ystGtI="; }) ]; @@ -92,7 +93,7 @@ buildPythonPackage rec { (lib.cmakeBool "PXR_BUILD_USDVIEW" withUsdView) (lib.cmakeBool "PXR_BUILD_USD_TOOLS" withTools) (lib.cmakeBool "PXR_ENABLE_MATERIALX_SUPPORT" true) - (lib.cmakeBool "PXR_ENABLE_OSL_SUPPORT" (!stdenv.isDarwin && withOsl)) + (lib.cmakeBool "PXR_ENABLE_OSL_SUPPORT" (!stdenv.hostPlatform.isDarwin && withOsl)) ]; nativeBuildInputs = @@ -124,15 +125,15 @@ buildPythonPackage rec { ptex tbb ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ libGL libX11 libXt ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Cocoa ]) + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Cocoa ]) ++ lib.optionals withOsl [ osl ] ++ lib.optionals withUsdView [ qt6.qtbase ] - ++ lib.optionals (withUsdView && stdenv.isLinux) [ + ++ lib.optionals (withUsdView && stdenv.hostPlatform.isLinux) [ qt6.qtbase qt6.qtwayland ]; @@ -174,7 +175,10 @@ buildPythonPackage rec { for interchange between graphics applications. ''; homepage = "https://openusd.org/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ shaddydc ]; + license = lib.licenses.tost; + maintainers = with lib.maintainers; [ + shaddydc + gador + ]; }; } |