diff options
| author | Gabriel Ebner <gebner@gebner.org> | 2021-04-03 11:26:05 +0200 |
|---|---|---|
| committer | Gabriel Ebner <gebner@gebner.org> | 2021-04-03 11:57:13 +0200 |
| commit | eae0b8fbfb9b2e4c348b33ca030eb79b3c30ee62 (patch) | |
| tree | befef9deba9b2347e3a29ad9d797357aa509e357 /pkgs/applications/misc/blender/default.nix | |
| parent | 3ab6e84b79abc45855e666fff33078189b4960c3 (diff) | |
| download | nixpkgs-eae0b8fbfb9b2e4c348b33ca030eb79b3c30ee62.tar nixpkgs-eae0b8fbfb9b2e4c348b33ca030eb79b3c30ee62.tar.gz nixpkgs-eae0b8fbfb9b2e4c348b33ca030eb79b3c30ee62.tar.bz2 nixpkgs-eae0b8fbfb9b2e4c348b33ca030eb79b3c30ee62.tar.lz nixpkgs-eae0b8fbfb9b2e4c348b33ca030eb79b3c30ee62.tar.xz nixpkgs-eae0b8fbfb9b2e4c348b33ca030eb79b3c30ee62.tar.zst nixpkgs-eae0b8fbfb9b2e4c348b33ca030eb79b3c30ee62.zip | |
blender: 2.91.0 -> 2.92.0
Diffstat (limited to 'pkgs/applications/misc/blender/default.nix')
| -rw-r--r-- | pkgs/applications/misc/blender/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 5df5dad519a..451cc9a33f3 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -10,6 +10,8 @@ , spaceNavSupport ? stdenv.isLinux, libspnav , makeWrapper , pugixml, llvmPackages, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL +, potrace +, openxr-loader , embree, gmp }: @@ -24,11 +26,11 @@ let in stdenv.mkDerivation rec { pname = "blender"; - version = "2.91.0"; + version = "2.92.0"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "0x396lgmk0dq9115yrc36s8zwxzmjr490sr5n2y6w27y17yllyjm"; + sha256 = "15a5vffn18a920286x0avbc2rap56k6y531wgibq68r90g2cz4g7"; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; @@ -44,11 +46,13 @@ stdenv.mkDerivation rec { embree gmp pugixml + potrace ] ++ (if (!stdenv.isDarwin) then [ libXi libX11 libXext libXrender libGLU libGL openal libXxf86vm + openxr-loader # OpenVDB currently doesn't build on darwin openvdb ] @@ -104,6 +108,7 @@ stdenv.mkDerivation rec { "-DWITH_PYTHON_INSTALL=OFF" "-DWITH_PYTHON_INSTALL_NUMPY=OFF" "-DPYTHON_NUMPY_PATH=${python3Packages.numpy}/${python.sitePackages}" + "-DPYTHON_NUMPY_INCLUDE_DIRS=${python3Packages.numpy}/${python.sitePackages}/numpy/core/include" "-DWITH_OPENVDB=ON" "-DWITH_TBB=ON" "-DWITH_IMAGE_OPENJPEG=ON" |