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 { };