diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-02-28 13:55:13 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-02-29 14:19:11 -0500 |
| commit | 27578856bfa817ad92c4fd0dcd87a67749ea3a5d (patch) | |
| tree | 2870acdff57525a324c050a91b6556652d77c5d5 /pkgs/applications/misc/blender/default.nix | |
| parent | 3a3ccb106e0b96c568e0cc41edb90095de767c80 (diff) | |
| download | nixpkgs-27578856bfa817ad92c4fd0dcd87a67749ea3a5d.tar nixpkgs-27578856bfa817ad92c4fd0dcd87a67749ea3a5d.tar.gz nixpkgs-27578856bfa817ad92c4fd0dcd87a67749ea3a5d.tar.bz2 nixpkgs-27578856bfa817ad92c4fd0dcd87a67749ea3a5d.tar.lz nixpkgs-27578856bfa817ad92c4fd0dcd87a67749ea3a5d.tar.xz nixpkgs-27578856bfa817ad92c4fd0dcd87a67749ea3a5d.tar.zst nixpkgs-27578856bfa817ad92c4fd0dcd87a67749ea3a5d.zip | |
blender: fix enableNumpy option, enable it unconditionally
Workarounds https://developer.blender.org/T74304 Audaspace requires numpy, we already have to provide numpy unconditionally via PYTHON_NUMPY_PATH.
Diffstat (limited to 'pkgs/applications/misc/blender/default.nix')
| -rw-r--r-- | pkgs/applications/misc/blender/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 277bb5fe1f2..75f5b8302e6 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -7,7 +7,7 @@ , jackaudioSupport ? false, libjack2 , cudaSupport ? config.cudaSupport or false, cudatoolkit , colladaSupport ? true, opencollada -, enableNumpy ? false, makeWrapper +, makeWrapper , pugixml, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL }: @@ -117,11 +117,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postInstall = optionalString enableNumpy - '' - wrapProgram $out/bin/blender \ - --prefix PYTHONPATH : ${python3Packages.numpy}/${python.sitePackages} - ''; + 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 = '' + wrapProgram $blenderExecutable \ + --add-flags '--python-expr "import sys; sys.path.append(\"${python3Packages.numpy}/${python.sitePackages}\")"' + ''; # Set RUNPATH so that libcuda and libnvrtc in /run/opengl-driver(-32)/lib can be # found. See the explanation in libglvnd. |