Commit 46f1dbf4 authored by Yureka's avatar Yureka
Browse files

blender: build with openexr 3

parent f164a127

pkgs/applications/misc/blender/default.nix

+3 −3
Original line number Diff line number Diff line 
{ 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.

pkgs/top-level/all-packages.nix

+1 −0
Original line number Diff line number Diff line
@@ -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;

  };