diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/blender')
-rw-r--r-- | nixpkgs/pkgs/applications/misc/blender/darwin.patch | 21 | ||||
-rw-r--r-- | nixpkgs/pkgs/applications/misc/blender/default.nix | 14 |
2 files changed, 13 insertions, 22 deletions
diff --git a/nixpkgs/pkgs/applications/misc/blender/darwin.patch b/nixpkgs/pkgs/applications/misc/blender/darwin.patch index 43b96466df28..c426c0b66077 100644 --- a/nixpkgs/pkgs/applications/misc/blender/darwin.patch +++ b/nixpkgs/pkgs/applications/misc/blender/darwin.patch @@ -9,7 +9,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf endif() if(WITH_OPENAL) -@@ -79,7 +78,7 @@ endif() +@@ -86,7 +85,7 @@ endif() if(WITH_CODEC_SNDFILE) set(LIBSNDFILE ${LIBDIR}/sndfile) set(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE}/include) @@ -18,7 +18,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf set(LIBSNDFILE_LIBPATH ${LIBSNDFILE}/lib ${LIBDIR}/ffmpeg/lib) # TODO, deprecate endif() -@@ -90,7 +89,7 @@ if(WITH_PYTHON) +@@ -97,7 +96,7 @@ if(WITH_PYTHON) # normally cached but not since we include them with blender set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m") set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}m") @@ -27,7 +27,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}") # set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled else() -@@ -155,10 +154,7 @@ if(WITH_CODEC_FFMPEG) +@@ -162,10 +161,7 @@ if(WITH_CODEC_FFMPEG) set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include) set(FFMPEG_LIBRARIES avcodec avdevice avformat avutil @@ -39,7 +39,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf set(FFMPEG_LIBPATH ${FFMPEG}/lib) endif() -@@ -199,14 +195,14 @@ if(WITH_OPENCOLLADA) +@@ -206,14 +202,14 @@ if(WITH_OPENCOLLADA) set(OPENCOLLADA ${LIBDIR}/opencollada) set(OPENCOLLADA_INCLUDE_DIRS @@ -60,16 +60,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf set(OPENCOLLADA_LIBRARIES OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -@@ -215,7 +211,7 @@ if(WITH_OPENCOLLADA) - -lMathMLSolver - -lGeneratedSaxParser - -lbuffer -lftoa -lUTF -- ${OPENCOLLADA_LIBPATH}/libxml2.a -+ xml2 - ) - # PCRE is bundled with openCollada - # set(PCRE ${LIBDIR}/pcre) -@@ -276,14 +272,13 @@ if(WITH_BOOST) +@@ -277,14 +273,13 @@ if(WITH_BOOST) endif() if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG) @@ -85,7 +76,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} -@@ -306,7 +301,7 @@ endif() +@@ -307,7 +302,7 @@ endif() if(WITH_OPENCOLORIO) set(OPENCOLORIO ${LIBDIR}/opencolorio) set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include) diff --git a/nixpkgs/pkgs/applications/misc/blender/default.nix b/nixpkgs/pkgs/applications/misc/blender/default.nix index e27aca4fc3d1..bf2a89ade559 100644 --- a/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/nixpkgs/pkgs/applications/misc/blender/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew +{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg_3, gettext, glew , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile , libtiff, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio2, openjpeg, python3Packages @@ -17,18 +17,18 @@ let python = python3Packages.python; in stdenv.mkDerivation rec { pname = "blender"; - version = "2.82a"; + version = "2.83.0"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "18zbdgas6qf2kmvvlimxgnq7y9kj7hdxcgixrs6fj50x40q01q2d"; + sha256 = "07rzm4xaj94pjxy2vlqfhi1adsqpshfkrzrq8kljmcbnw22vrqhl"; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; nativeBuildInputs = [ cmake ] ++ optional cudaSupport addOpenGLRunpath; buildInputs = - [ boost ffmpeg gettext glew ilmbase + [ boost ffmpeg_3 gettext glew ilmbase freetype libjpeg libpng libsamplerate libsndfile libtiff opencolorio openexr openimagedenoise openimageio2 openjpeg python zlib fftw jemalloc alembic @@ -86,9 +86,9 @@ stdenv.mkDerivation rec { "-DWITH_SDL=OFF" "-DWITH_OPENCOLORIO=ON" "-DWITH_OPENSUBDIV=ON" - "-DPYTHON_LIBRARY=${python.libPrefix}m" + "-DPYTHON_LIBRARY=${python.libPrefix}" "-DPYTHON_LIBPATH=${python}/lib" - "-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}m" + "-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}" "-DPYTHON_VERSION=${python.pythonVersion}" "-DWITH_PYTHON_INSTALL=OFF" "-DWITH_PYTHON_INSTALL_NUMPY=OFF" @@ -142,6 +142,6 @@ stdenv.mkDerivation rec { # say: "We've decided to cancel the BL offering for an indefinite period." license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu veprbl ]; }; } |