public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blender: install with python3Packages.requests, fixes #97250 (#118987)

Browse Source 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
Julien Moutinho 2021-04-12 04:12:40 +02:00 committed by GitHub
parent 71fcdc0825
commit a1bc838a5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/misc/blender/default.nix
View File

@ -35,7 +35,8 @@ stdenv.mkDerivation rec {
patches = lib.optional stdenv.isDarwin ./darwin.patch; patches = lib.optional stdenv.isDarwin ./darwin.patch;
nativeBuildInputs = [ cmake makeWrapper ] ++ optional cudaSupport addOpenGLRunpath; nativeBuildInputs = [ cmake makeWrapper python3Packages.wrapPython ]
++ optionals cudaSupport [ addOpenGLRunpath ];
buildInputs = buildInputs =
[ boost ffmpeg gettext glew ilmbase [ boost ffmpeg gettext glew ilmbase
freetype libjpeg libpng libsamplerate libsndfile libtiff freetype libjpeg libpng libsamplerate libsndfile libtiff
@ -63,6 +64,7 @@ stdenv.mkDerivation rec {
++ optional cudaSupport cudatoolkit ++ optional cudaSupport cudatoolkit
++ optional colladaSupport opencollada ++ optional colladaSupport opencollada
++ optional spaceNavSupport libspnav; ++ optional spaceNavSupport libspnav;
pythonPath = with python3Packages; [ numpy requests ];
postPatch = '' postPatch = ''
# allow usage of dynamically linked embree # allow usage of dynamically linked embree
@ -109,6 +111,7 @@ stdenv.mkDerivation rec {
"-DWITH_PYTHON_INSTALL_NUMPY=OFF" "-DWITH_PYTHON_INSTALL_NUMPY=OFF"
"-DPYTHON_NUMPY_PATH=${python3Packages.numpy}/${python.sitePackages}" "-DPYTHON_NUMPY_PATH=${python3Packages.numpy}/${python.sitePackages}"
"-DPYTHON_NUMPY_INCLUDE_DIRS=${python3Packages.numpy}/${python.sitePackages}/numpy/core/include" "-DPYTHON_NUMPY_INCLUDE_DIRS=${python3Packages.numpy}/${python.sitePackages}/numpy/core/include"
"-DWITH_PYTHON_INSTALL_REQUESTS=OFF"
"-DWITH_OPENVDB=ON" "-DWITH_OPENVDB=ON"
"-DWITH_TBB=ON" "-DWITH_TBB=ON"
"-DWITH_IMAGE_OPENJPEG=ON" "-DWITH_IMAGE_OPENJPEG=ON"
@ -137,10 +140,11 @@ stdenv.mkDerivation rec {
blenderExecutable = blenderExecutable =
placeholder "out" + (if stdenv.isDarwin then "/Blender.app/Contents/MacOS/Blender" else "/bin/blender"); 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 = '' postInstall = ''
buildPythonPath "$pythonPath"
wrapProgram $blenderExecutable \ wrapProgram $blenderExecutable \
--prefix PYTHONPATH : ${python3Packages.numpy}/${python.sitePackages} \ --prefix PATH : $program_PATH \
--prefix PYTHONPATH : "$program_PYTHONPATH" \
--add-flags '--python-use-system-env' --add-flags '--python-use-system-env'
''; '';