diff options
| author | Andrew Marshall <andrew@johnandrewmarshall.com> | 2024-02-26 00:31:20 -0500 |
|---|---|---|
| committer | Andrew Marshall <andrew@johnandrewmarshall.com> | 2024-03-05 08:46:44 -0500 |
| commit | bd78a3bfa5e4437822ec89a8642ae25ccdcb1956 (patch) | |
| tree | 871c0ff0d7b57e3e99e80db272a225f1f17f61de | |
| parent | f8ceab72ffa6cbc2bab363d9d5a17136d8dae532 (diff) | |
blender: prefer using alias for desired pythonPackages
Otherwise all these references have to be updated whenever the Python version is changed.
| -rw-r--r-- | pkgs/applications/misc/blender/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 40a5e9066ebbc..e689e0a6b5061 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: rec { --replace '${"$"}{LIBDIR}/opencollada' \ '${opencollada}' \ --replace '${"$"}{PYTHON_LIBPATH}/site-packages/numpy' \ - '${python310Packages.numpy}/${python.sitePackages}/numpy' + '${pythonPackages.numpy}/${python.sitePackages}/numpy' '' else '' @@ -149,8 +149,8 @@ stdenv.mkDerivation (finalAttrs: rec { "-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}" "-DPYTHON_LIBPATH=${python}/lib" "-DPYTHON_LIBRARY=${python.libPrefix}" - "-DPYTHON_NUMPY_INCLUDE_DIRS=${python310Packages.numpy}/${python.sitePackages}/numpy/core/include" - "-DPYTHON_NUMPY_PATH=${python310Packages.numpy}/${python.sitePackages}" + "-DPYTHON_NUMPY_INCLUDE_DIRS=${pythonPackages.numpy}/${python.sitePackages}/numpy/core/include" + "-DPYTHON_NUMPY_PATH=${pythonPackages.numpy}/${python.sitePackages}" "-DPYTHON_VERSION=${python.pythonVersion}" "-DWITH_ALEMBIC=ON" "-DWITH_CODEC_FFMPEG=ON" @@ -198,7 +198,7 @@ stdenv.mkDerivation (finalAttrs: rec { cmake llvmPackages.llvm.dev makeWrapper - python310Packages.wrapPython + pythonPackages.wrapPython ] ++ lib.optionals cudaSupport [ addOpenGLRunpath @@ -281,7 +281,7 @@ stdenv.mkDerivation (finalAttrs: rec { ++ lib.optional jackaudioSupport libjack2 ++ lib.optional spaceNavSupport libspnav; - pythonPath = with python310Packages; [ + pythonPath = with pythonPackages; [ numpy requests zstandard |