mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-31 01:04:25 +00:00
blender: fix build, don't install builtin Python
This commit is contained in:
parent
9db19905be
commit
5041e0eea9
@ -1,7 +1,7 @@
|
|||||||
{ stdenv, lib, fetchurl, SDL, boost, cmake, ffmpeg, gettext, glew
|
{ stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew
|
||||||
, ilmbase, libXi, libjpeg, libpng, libsamplerate, libsndfile
|
, ilmbase, libXi, libX11, libjpeg, libpng, libsamplerate, libsndfile
|
||||||
, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python
|
, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python
|
||||||
, zlib, fftw, opensubdiv
|
, zlib, fftw, opensubdiv, freetype
|
||||||
, jackaudioSupport ? false, libjack2
|
, jackaudioSupport ? false, libjack2
|
||||||
, cudaSupport ? false, cudatoolkit
|
, cudaSupport ? false, cudatoolkit
|
||||||
, colladaSupport ? true, opencollada
|
, colladaSupport ? true, opencollada
|
||||||
@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ SDL boost cmake ffmpeg gettext glew ilmbase libXi
|
[ boost cmake ffmpeg gettext glew ilmbase libXi libX11 freetype
|
||||||
libjpeg libpng libsamplerate libsndfile libtiff mesa openal
|
libjpeg libpng libsamplerate libsndfile libtiff mesa openal
|
||||||
opencolorio openexr openimageio /* openjpeg */ python zlib fftw
|
opencolorio openexr openimageio openjpeg python zlib fftw
|
||||||
(opensubdiv.override { inherit cudaSupport; })
|
(opensubdiv.override { inherit cudaSupport; })
|
||||||
]
|
]
|
||||||
++ optional jackaudioSupport libjack2
|
++ optional jackaudioSupport libjack2
|
||||||
@ -41,12 +41,15 @@ stdenv.mkDerivation rec {
|
|||||||
"-DWITH_SDL=ON"
|
"-DWITH_SDL=ON"
|
||||||
"-DWITH_GAMEENGINE=ON"
|
"-DWITH_GAMEENGINE=ON"
|
||||||
"-DWITH_OPENCOLORIO=ON"
|
"-DWITH_OPENCOLORIO=ON"
|
||||||
|
"-DWITH_SYSTEM_OPENJPEG=ON"
|
||||||
"-DWITH_PLAYER=ON"
|
"-DWITH_PLAYER=ON"
|
||||||
"-DWITH_OPENSUBDIV=ON"
|
"-DWITH_OPENSUBDIV=ON"
|
||||||
"-DPYTHON_LIBRARY=python${python.majorVersion}m"
|
"-DPYTHON_LIBRARY=python${python.majorVersion}m"
|
||||||
"-DPYTHON_LIBPATH=${python}/lib"
|
"-DPYTHON_LIBPATH=${python}/lib"
|
||||||
"-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m"
|
"-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m"
|
||||||
"-DPYTHON_VERSION=${python.majorVersion}"
|
"-DPYTHON_VERSION=${python.majorVersion}"
|
||||||
|
"-DWITH_PYTHON_INSTALL=OFF"
|
||||||
|
"-DWITH_PYTHON_INSTALL_NUMPY=OFF"
|
||||||
]
|
]
|
||||||
++ optional jackaudioSupport "-DWITH_JACK=ON"
|
++ optional jackaudioSupport "-DWITH_JACK=ON"
|
||||||
++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON"
|
++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON"
|
||||||
|
Loading…
Reference in New Issue
Block a user