From aea9ae5e59c35c6e7282bbf529f0af929beb77b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 9 Jul 2024 23:51:06 -0700 Subject: [PATCH 1/3] materialx: move to python3Packages --- .../python-modules/materialx/default.nix} | 11 ++++++----- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 10 insertions(+), 5 deletions(-) rename pkgs/{by-name/ma/materialx/package.nix => development/python-modules/materialx/default.nix} (91%) diff --git a/pkgs/by-name/ma/materialx/package.nix b/pkgs/development/python-modules/materialx/default.nix similarity index 91% rename from pkgs/by-name/ma/materialx/package.nix rename to pkgs/development/python-modules/materialx/default.nix index cac615eaecbb..410178d1f0f2 100644 --- a/pkgs/by-name/ma/materialx/package.nix +++ b/pkgs/development/python-modules/materialx/default.nix @@ -1,19 +1,20 @@ { lib, stdenv, + buildPythonPackage, fetchFromGitHub, cmake, + setuptools, darwin, libX11, libXt, libGL, openimageio, imath, - python3Packages, - python3 + python, }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "materialx"; version = "1.38.10"; @@ -28,7 +29,7 @@ python3Packages.buildPythonPackage rec { nativeBuildInputs = [ cmake - python3Packages.setuptools + setuptools ]; buildInputs = @@ -60,7 +61,7 @@ python3Packages.buildPythonPackage rec { postInstall = '' # Make python lib properly accessible - target_dir=$out/${python3.sitePackages} + target_dir=$out/${python.sitePackages} mkdir -p $(dirname $target_dir) # required for cmake to find the bindings, when included in other projects ln -s $out/python $target_dir diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12c48c9586da..7d3aba938577 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5735,6 +5735,8 @@ with pkgs; mat2 = with python3.pkgs; toPythonApplication mat2; + materialx = with python3Packages; toPythonApplication materialx; + maxcso = callPackage ../tools/archivers/maxcso { }; measureme = callPackage ../development/tools/rust/measureme { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d4b56d1be53f..80d4447be1ac 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7344,6 +7344,8 @@ self: super: with self; { material-color-utilities = callPackage ../development/python-modules/material-color-utilities { }; + materialx = callPackage ../development/python-modules/materialx { }; + matchpy = callPackage ../development/python-modules/matchpy { }; mathlibtools = callPackage ../development/python-modules/mathlibtools { }; From 49048e6378ae55afe6e74a2ad20b3bb64b5ecd8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 9 Jul 2024 23:31:15 -0700 Subject: [PATCH 2/3] python312Packages.materialx: modernize --- pkgs/development/python-modules/materialx/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/materialx/default.nix b/pkgs/development/python-modules/materialx/default.nix index 410178d1f0f2..b1e11ba6de23 100644 --- a/pkgs/development/python-modules/materialx/default.nix +++ b/pkgs/development/python-modules/materialx/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "AcademySoftwareFoundation"; repo = "MaterialX"; rev = "v${version}"; - sha256 = "sha256-/kMHmW2dptZNtjuhE5s+jvPRIdtY+FRiVtMU+tiBgQo="; + hash = "sha256-/kMHmW2dptZNtjuhE5s+jvPRIdtY+FRiVtMU+tiBgQo="; }; format = "other"; @@ -68,6 +68,7 @@ buildPythonPackage rec { ''; 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"; homepage = "https://materialx.org"; maintainers = [ lib.maintainers.gador ]; From c47cca36340653f548c7824ae76d5f2ebc3609e7 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 9 Jul 2024 23:40:55 -0400 Subject: [PATCH 3/3] blender: use materialx with correct Python version The top-level materialx is with the default `python3`, we want to use the version matching the Python we are using here. --- pkgs/applications/misc/blender/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 2e1294a4080c..bb5a0b660086 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -16,7 +16,6 @@ config, cudaPackages, cudaSupport ? config.cudaSupport, - darwin, dbus, embree, fetchpatch, @@ -55,7 +54,6 @@ libxkbcommon, llvmPackages, makeWrapper, - materialx, mesa, ocl-icd, openal, @@ -127,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace source/creator/CMakeLists.txt \ --replace-fail '${"$"}{LIBDIR}/python' \ '${python3}' \ - --replace-fail '${"$"}{LIBDIR}/materialx/' '${materialx}/' + --replace-fail '${"$"}{LIBDIR}/materialx/' '${python3Packages.materialx}/' substituteInPlace build_files/cmake/platform/platform_apple.cmake \ --replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlicommon-static.a' \ '${lib.getLib brotli}/lib/libbrotlicommon.dylib' \ @@ -160,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_FFTW3=ON" "-DWITH_IMAGE_OPENJPEG=ON" "-DWITH_INSTALL_PORTABLE=OFF" - "-DMaterialX_DIR=${materialx}/lib/cmake/MaterialX" + "-DMaterialX_DIR=${python3Packages.materialx}/lib/cmake/MaterialX" "-DWITH_MOD_OCEANSIM=ON" "-DWITH_OPENCOLLADA=${if colladaSupport then "ON" else "OFF"}" "-DWITH_OPENCOLORIO=ON" @@ -233,7 +231,6 @@ stdenv.mkDerivation (finalAttrs: { libsndfile libtiff libwebp - materialx opencolorio openexr openimageio @@ -244,6 +241,7 @@ stdenv.mkDerivation (finalAttrs: { potrace pugixml python3 + python3Packages.materialx tbb zlib zstd @@ -299,7 +297,7 @@ stdenv.mkDerivation (finalAttrs: { ps = python3Packages; in [ - materialx + ps.materialx ps.numpy ps.requests ps.zstandard