blender: 2.92.0 -> 2.93.0

+9 -9
+9 -9
pkgs/applications/misc/blender/default.nix
··· 1 { config, stdenv, lib, fetchurl, fetchzip, boost, cmake, ffmpeg, gettext, glew 2 , ilmbase, libXi, libX11, libXext, libXrender 3 , libjpeg, libpng, libsamplerate, libsndfile 4 - , libtiff, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio2, openjpeg, python3Packages 5 , openvdb, libXxf86vm, tbb, alembic 6 , zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath 7 , jackaudioSupport ? false, libjack2 ··· 17 18 with lib; 19 let 20 - python = python3Packages.python; 21 optix = fetchzip { 22 url = "https://developer.download.nvidia.com/redist/optix/v7.0/OptiX-7.0.0-include.zip"; 23 sha256 = "1b3ccd3197anya2bj3psxdrvrpfgiwva5zfv2xmyrl73nb2dvfr7"; ··· 26 in 27 stdenv.mkDerivation rec { 28 pname = "blender"; 29 - version = "2.92.0"; 30 31 src = fetchurl { 32 url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; 33 - sha256 = "15a5vffn18a920286x0avbc2rap56k6y531wgibq68r90g2cz4g7"; 34 }; 35 36 patches = lib.optional stdenv.isDarwin ./darwin.patch; 37 38 - nativeBuildInputs = [ cmake makeWrapper python3Packages.wrapPython llvmPackages.llvm.dev ] 39 ++ optionals cudaSupport [ addOpenGLRunpath ]; 40 buildInputs = 41 [ boost ffmpeg gettext glew ilmbase ··· 64 ++ optional cudaSupport cudatoolkit 65 ++ optional colladaSupport opencollada 66 ++ optional spaceNavSupport libspnav; 67 - pythonPath = with python3Packages; [ numpy requests ]; 68 69 postPatch = '' 70 # allow usage of dynamically linked embree ··· 87 --replace '${"$"}{LIBDIR}/opencollada' \ 88 '${opencollada}' \ 89 --replace '${"$"}{PYTHON_LIBPATH}/site-packages/numpy' \ 90 - '${python3Packages.numpy}/${python.sitePackages}/numpy' 91 '' else '' 92 substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"' 93 ''); ··· 109 "-DPYTHON_VERSION=${python.pythonVersion}" 110 "-DWITH_PYTHON_INSTALL=OFF" 111 "-DWITH_PYTHON_INSTALL_NUMPY=OFF" 112 - "-DPYTHON_NUMPY_PATH=${python3Packages.numpy}/${python.sitePackages}" 113 - "-DPYTHON_NUMPY_INCLUDE_DIRS=${python3Packages.numpy}/${python.sitePackages}/numpy/core/include" 114 "-DWITH_PYTHON_INSTALL_REQUESTS=OFF" 115 "-DWITH_OPENVDB=ON" 116 "-DWITH_TBB=ON"
··· 1 { config, stdenv, lib, fetchurl, fetchzip, boost, cmake, ffmpeg, gettext, glew 2 , ilmbase, libXi, libX11, libXext, libXrender 3 , libjpeg, libpng, libsamplerate, libsndfile 4 + , libtiff, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio2, openjpeg, python39Packages 5 , openvdb, libXxf86vm, tbb, alembic 6 , zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath 7 , jackaudioSupport ? false, libjack2 ··· 17 18 with lib; 19 let 20 + python = python39Packages.python; 21 optix = fetchzip { 22 url = "https://developer.download.nvidia.com/redist/optix/v7.0/OptiX-7.0.0-include.zip"; 23 sha256 = "1b3ccd3197anya2bj3psxdrvrpfgiwva5zfv2xmyrl73nb2dvfr7"; ··· 26 in 27 stdenv.mkDerivation rec { 28 pname = "blender"; 29 + version = "2.93.0"; 30 31 src = fetchurl { 32 url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; 33 + sha256 = "0f2rpqa39sir6g90khd2d2fs4kss0zhk7vya1nscf5yp8r566fxs"; 34 }; 35 36 patches = lib.optional stdenv.isDarwin ./darwin.patch; 37 38 + nativeBuildInputs = [ cmake makeWrapper python39Packages.wrapPython llvmPackages.llvm.dev ] 39 ++ optionals cudaSupport [ addOpenGLRunpath ]; 40 buildInputs = 41 [ boost ffmpeg gettext glew ilmbase ··· 64 ++ optional cudaSupport cudatoolkit 65 ++ optional colladaSupport opencollada 66 ++ optional spaceNavSupport libspnav; 67 + pythonPath = with python39Packages; [ numpy requests ]; 68 69 postPatch = '' 70 # allow usage of dynamically linked embree ··· 87 --replace '${"$"}{LIBDIR}/opencollada' \ 88 '${opencollada}' \ 89 --replace '${"$"}{PYTHON_LIBPATH}/site-packages/numpy' \ 90 + '${python39Packages.numpy}/${python.sitePackages}/numpy' 91 '' else '' 92 substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"' 93 ''); ··· 109 "-DPYTHON_VERSION=${python.pythonVersion}" 110 "-DWITH_PYTHON_INSTALL=OFF" 111 "-DWITH_PYTHON_INSTALL_NUMPY=OFF" 112 + "-DPYTHON_NUMPY_PATH=${python39Packages.numpy}/${python.sitePackages}" 113 + "-DPYTHON_NUMPY_INCLUDE_DIRS=${python39Packages.numpy}/${python.sitePackages}/numpy/core/include" 114 "-DWITH_PYTHON_INSTALL_REQUESTS=OFF" 115 "-DWITH_OPENVDB=ON" 116 "-DWITH_TBB=ON"