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

blender: Optionally enable numpy support

Browse Source 
This is required by some included addons (such as ANT landscape). Note
that we can't use -DWITH_PYTHON_INSTALL_NUMPY=ON because it's
conditional on -DWITH_PYTHON_INSTALL=ON.
This commit is contained in:
Eelco Dolstra 2018-03-30 21:58:28 +02:00
parent 514e3e8a07
commit 854e069107
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,15 +1,18 @@
{ stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew { stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew
, ilmbase, libXi, libX11, libXext, libXrender , ilmbase, libXi, libX11, libXext, libXrender
, libjpeg, libpng, libsamplerate, libsndfile , libjpeg, libpng, libsamplerate, libsndfile
, libtiff, libGLU_combined, openal, opencolorio, openexr, openimageio, openjpeg_1, python , libtiff, libGLU_combined, openal, opencolorio, openexr, openimageio, openjpeg_1, pythonPackages
, zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd , zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd
, jackaudioSupport ? false, libjack2 , jackaudioSupport ? false, libjack2
, cudaSupport ? false, cudatoolkit , cudaSupport ? false, cudatoolkit
, colladaSupport ? true, opencollada , colladaSupport ? true, opencollada
, enableNumpy ? false, makeWrapper
}: }:
with lib; with lib;
let python = pythonPackages.python; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "blender-2.79b"; name = "blender-2.79b";
@ -24,6 +27,7 @@ stdenv.mkDerivation rec {
freetype libjpeg libpng libsamplerate libsndfile libtiff libGLU_combined openal freetype libjpeg libpng libsamplerate libsndfile libtiff libGLU_combined openal
opencolorio openexr openimageio openjpeg_1 python zlib fftw jemalloc opencolorio openexr openimageio openjpeg_1 python zlib fftw jemalloc
(opensubdiv.override { inherit cudaSupport; }) (opensubdiv.override { inherit cudaSupport; })
makeWrapper
] ]
++ optional jackaudioSupport libjack2 ++ optional jackaudioSupport libjack2
++ optional cudaSupport cudatoolkit ++ optional cudaSupport cudatoolkit
@ -70,6 +74,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
postInstall = optionalString enableNumpy
''
wrapProgram $out/bin/blender \
--prefix PYTHONPATH : ${pythonPackages.numpy}/lib/python${python.majorVersion}/site-packages
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "3D Creation/Animation/Publishing System"; description = "3D Creation/Animation/Publishing System";
homepage = https://www.blender.org; homepage = https://www.blender.org;

2
pkgs/top-level/all-packages.nix
View File

@ -14904,7 +14904,7 @@ with pkgs;
blender = callPackage ../applications/misc/blender { blender = callPackage ../applications/misc/blender {
cudaSupport = config.cudaSupport or false; cudaSupport = config.cudaSupport or false;
python = python35; pythonPackages = python35Packages;
stdenv = overrideCC stdenv gcc6; stdenv = overrideCC stdenv gcc6;
}; };