diff options
| author | Julien Moutinho <ju1m@users.noreply.github.com> | 2021-04-12 04:12:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-12 04:12:40 +0200 |
| commit | a1bc838a5ef8aee5e3107ff7b8ed3720a6a7385b (patch) | |
| tree | 5140c40ef831309dcf77696e7546e5252343eca5 /pkgs/applications/misc/blender/default.nix | |
| parent | 71fcdc08257d619648992216e3eb5bbfb6c4574f (diff) | |
| download | nixpkgs-a1bc838a5ef8aee5e3107ff7b8ed3720a6a7385b.tar nixpkgs-a1bc838a5ef8aee5e3107ff7b8ed3720a6a7385b.tar.gz nixpkgs-a1bc838a5ef8aee5e3107ff7b8ed3720a6a7385b.tar.bz2 nixpkgs-a1bc838a5ef8aee5e3107ff7b8ed3720a6a7385b.tar.lz nixpkgs-a1bc838a5ef8aee5e3107ff7b8ed3720a6a7385b.tar.xz nixpkgs-a1bc838a5ef8aee5e3107ff7b8ed3720a6a7385b.tar.zst nixpkgs-a1bc838a5ef8aee5e3107ff7b8ed3720a6a7385b.zip | |
blender: install with python3Packages.requests, fixes #97250 (#118987)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Diffstat (limited to 'pkgs/applications/misc/blender/default.nix')
| -rw-r--r-- | pkgs/applications/misc/blender/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 451cc9a33f3..95a0e41d2ae 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -35,7 +35,8 @@ stdenv.mkDerivation rec { patches = lib.optional stdenv.isDarwin ./darwin.patch; - nativeBuildInputs = [ cmake makeWrapper ] ++ optional cudaSupport addOpenGLRunpath; + nativeBuildInputs = [ cmake makeWrapper python3Packages.wrapPython ] + ++ optionals cudaSupport [ addOpenGLRunpath ]; buildInputs = [ boost ffmpeg gettext glew ilmbase freetype libjpeg libpng libsamplerate libsndfile libtiff @@ -63,6 +64,7 @@ stdenv.mkDerivation rec { ++ optional cudaSupport cudatoolkit ++ optional colladaSupport opencollada ++ optional spaceNavSupport libspnav; + pythonPath = with python3Packages; [ numpy requests ]; postPatch = '' # allow usage of dynamically linked embree @@ -109,6 +111,7 @@ stdenv.mkDerivation rec { "-DWITH_PYTHON_INSTALL_NUMPY=OFF" "-DPYTHON_NUMPY_PATH=${python3Packages.numpy}/${python.sitePackages}" "-DPYTHON_NUMPY_INCLUDE_DIRS=${python3Packages.numpy}/${python.sitePackages}/numpy/core/include" + "-DWITH_PYTHON_INSTALL_REQUESTS=OFF" "-DWITH_OPENVDB=ON" "-DWITH_TBB=ON" "-DWITH_IMAGE_OPENJPEG=ON" @@ -137,10 +140,11 @@ stdenv.mkDerivation rec { blenderExecutable = placeholder "out" + (if stdenv.isDarwin then "/Blender.app/Contents/MacOS/Blender" else "/bin/blender"); - # --python-expr is used to workaround https://developer.blender.org/T74304 postInstall = '' + buildPythonPath "$pythonPath" wrapProgram $blenderExecutable \ - --prefix PYTHONPATH : ${python3Packages.numpy}/${python.sitePackages} \ + --prefix PATH : $program_PATH \ + --prefix PYTHONPATH : "$program_PYTHONPATH" \ --add-flags '--python-use-system-env' ''; |