Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 943aff5679d7
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ee01f461a33e
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 3, 2020

  1. 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.

(cherry picked from commit 2757885)

cc #81313
    @veprbl
    veprbl committed Mar 3, 2020
    Copy the full SHA
    ee01f46 View commit details
Showing with 8 additions and 6 deletions.
  1. +8 −6 pkgs/applications/misc/blender/default.nix
14 changes: 8 additions & 6 deletions pkgs/applications/misc/blender/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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.