cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

blender: build with openexr 3

Browse source
This commit is contained in:
Yureka 2024-01-06 02:01:19 +01:00
parent f164a12772
commit 46f1dbf40d
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/misc/blender/default.nix
View file

@ -1,5 +1,5 @@
{ config, stdenv, lib, fetchurl, fetchzip, boost, cmake, ffmpeg, gettext, glew
, ilmbase, libepoxy, libXi, libX11, libXext, libXrender
, libepoxy, libXi, libX11, libXext, libXrender
, libjpeg, libpng, libsamplerate, libsndfile
, libtiff, libwebp, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio, openjpeg, python310Packages
, openvdb, libXxf86vm, tbb, alembic
@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: rec {
]
++ lib.optionals waylandSupport [ pkg-config ];
buildInputs =
[ boost ffmpeg gettext glew ilmbase
[ boost ffmpeg gettext glew
freetype libjpeg libpng libsamplerate libsndfile libtiff libwebp
opencolorio openexr openimageio openjpeg python zlib zstd fftw fftwFloat jemalloc
alembic
@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: rec {
"-DOPTIX_ROOT_DIR=${optix}"
];
env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}";
env.NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}";
# Since some dependencies are built with gcc 6, we need gcc 6's
# libstdc++ in our RPATH. Sigh.

1
pkgs/top-level/all-packages.nix
View file

@ -30659,6 +30659,7 @@ with pkgs;
blender = callPackage ../applications/misc/blender {
# LLVM 11 crashes when compiling GHOST_SystemCocoa.mm
stdenv = if stdenv.isDarwin then llvmPackages_10.stdenv else stdenv;
openexr = openexr_3;
inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL;
};