git.iko.soy/typeable/nixpkgs
on master help sign in
blender: fix on darwin
commit492f3b80abad67261d1da0fbc415749f9a51c2ee authorDmitry Kalinkin <dmitry.kalinkin@gmail.com> dateThu 26 Nov 2020, 14:51 (6 years ago) parentd9d8c8a
2 files changed+30−73
pkgs/applications/misc/blender/darwin.patch+24−61 pkgs/applications/misc/blender/default.nix+6−12
pkgs/applications/misc/blender/darwin.patch+24−61
@@ -1,24 +1,26 @@
11diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
22--- a/build_files/cmake/platform/platform_apple.cmake
33+++ b/build_files/cmake/platform/platform_apple.cmake
4−@@ -35,7 +35,6 @@ else()
4+@@ -80,7 +80,6 @@ else()
55 message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
66 endif()
77 if(NOT EXISTS "${LIBDIR}/")
88- message(FATAL_ERROR "Mac OSX requires pre-compiled libs at: '${LIBDIR}'")
99 endif()
1010
11− if(WITH_OPENAL)
12−@@ -86,7 +85,7 @@ endif()
13− if(WITH_CODEC_SNDFILE)
14− set(LIBSNDFILE ${LIBDIR}/sndfile)
15− set(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE}/include)
16−- set(LIBSNDFILE_LIBRARIES sndfile FLAC ogg vorbis vorbisenc)
17−+ set(LIBSNDFILE_LIBRARIES sndfile)
18− set(LIBSNDFILE_LIBPATH ${LIBSNDFILE}/lib ${LIBDIR}/ffmpeg/lib) # TODO, deprecate
19− endif()
11+ # -------------------------------------------------------------------------
12+@@ -112,10 +111,6 @@ if(WITH_CODEC_SNDFILE)
13+ find_library(_sndfile_VORBIS_LIBRARY NAMES vorbis HINTS ${LIBDIR}/ffmpeg/lib)
14+ find_library(_sndfile_VORBISENC_LIBRARY NAMES vorbisenc HINTS ${LIBDIR}/ffmpeg/lib)
15+ list(APPEND LIBSNDFILE_LIBRARIES
16+- ${_sndfile_FLAC_LIBRARY}
17+- ${_sndfile_OGG_LIBRARY}
18+- ${_sndfile_VORBIS_LIBRARY}
19+- ${_sndfile_VORBISENC_LIBRARY}
20+ )
2021
21−@@ -97,7 +96,7 @@ if(WITH_PYTHON)
22+ print_found_status("SndFile libraries" "${LIBSNDFILE_LIBRARIES}")
23+@@ -132,7 +127,7 @@ if(WITH_PYTHON)
2224 # normally cached but not since we include them with blender
2325 set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m")
2426 set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}m")
@@ -27,40 +29,18 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf
2729 set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}")
2830 # set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled
2931 else()
30−@@ -162,10 +161,7 @@ if(WITH_CODEC_FFMPEG)
31− set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
32− set(FFMPEG_LIBRARIES
32+@@ -173,9 +168,7 @@ endif()
33+ if(WITH_CODEC_FFMPEG)
34+ set(FFMPEG_FIND_COMPONENTS
3335 avcodec avdevice avformat avutil
34−- mp3lame swscale x264 xvidcore
35−- theora theoradec theoraenc
36−- vorbis vorbisenc vorbisfile ogg opus
37−- vpx swresample)
38−+ swscale swresample)
39− set(FFMPEG_LIBPATH ${FFMPEG}/lib)
36+- mp3lame ogg opus swresample swscale
37+- theora theoradec theoraenc vorbis vorbisenc
38+- vorbisfile vpx x264 xvidcore)
39++ swresample swscale)
40+ find_package(FFmpeg)
4041 endif()
4142
42−@@ -206,14 +202,14 @@ if(WITH_OPENCOLLADA)
43− set(OPENCOLLADA ${LIBDIR}/opencollada)
44−
45− set(OPENCOLLADA_INCLUDE_DIRS
46−- ${LIBDIR}/opencollada/include/COLLADAStreamWriter
47−- ${LIBDIR}/opencollada/include/COLLADABaseUtils
48−- ${LIBDIR}/opencollada/include/COLLADAFramework
49−- ${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader
50−- ${LIBDIR}/opencollada/include/GeneratedSaxParser
51−+ ${LIBDIR}/opencollada/include/opencollada/COLLADAStreamWriter
52−+ ${LIBDIR}/opencollada/include/opencollada/COLLADABaseUtils
53−+ ${LIBDIR}/opencollada/include/opencollada/COLLADAFramework
54−+ ${LIBDIR}/opencollada/include/opencollada/COLLADASaxFrameworkLoader
55−+ ${LIBDIR}/opencollada/include/opencollada/GeneratedSaxParser
56− )
57−
58−- set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
59−+ set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib/opencollada)
60− set(OPENCOLLADA_LIBRARIES
61− OpenCOLLADASaxFrameworkLoader
62− -lOpenCOLLADAFramework
63−@@ -277,14 +273,13 @@ if(WITH_BOOST)
43+@@ -266,7 +259,6 @@ if(WITH_BOOST)
6444 endif()
6545
6646 if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG)
@@ -68,25 +48,8 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf
6848 endif()
6949
7050 if(WITH_OPENIMAGEIO)
71− set(OPENIMAGEIO ${LIBDIR}/openimageio)
72− set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
73− set(OPENIMAGEIO_LIBRARIES
74−- ${OPENIMAGEIO}/lib/libOpenImageIO.a
75−+ ${OPENIMAGEIO}/lib/libOpenImageIO.dylib
76− ${PNG_LIBRARIES}
77− ${JPEG_LIBRARIES}
78− ${TIFF_LIBRARY}
79−@@ -307,7 +302,7 @@ endif()
80− if(WITH_OPENCOLORIO)
81− set(OPENCOLORIO ${LIBDIR}/opencolorio)
82− set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
83−- set(OPENCOLORIO_LIBRARIES OpenColorIO tinyxml yaml-cpp)
84−+ set(OPENCOLORIO_LIBRARIES OpenColorIO)
85− set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib)
86− endif()
87−
88−@@ -443,7 +438,7 @@ else()
89− set(CMAKE_CXX_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
51+@@ -439,7 +431,7 @@ else()
52+ set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mdynamic-no-pic")
9053 endif()
9154
9255-if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5)
pkgs/applications/misc/blender/default.nix+6−12
@@ -8,7 +8,7 @@
88, cudaSupport ? config.cudaSupport or false, cudatoolkit
99, colladaSupport ? true, opencollada
1010, makeWrapper
11−, pugixml, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL
11+, pugixml, llvmPackages, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL
1212, embree, gmp
1313}:
1414
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
4747 openvdb
4848 ]
4949 else [
50− pugixml SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL
50+ pugixml llvmPackages.openmp SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL
5151 ])
5252 ++ optional jackaudioSupport libjack2
5353 ++ optional cudaSupport cudatoolkit
@@ -61,7 +61,9 @@ stdenv.mkDerivation rec {
6161 : > build_files/cmake/platform/platform_apple_xcode.cmake
6262 substituteInPlace source/creator/CMakeLists.txt \
6363 --replace '${"$"}{LIBDIR}/python' \
64− '${python}'
64+ '${python}' \
65+ --replace '${"$"}{LIBDIR}/openmp' \
66+ '${llvmPackages.openmp}'
6567 substituteInPlace build_files/cmake/platform/platform_apple.cmake \
6668 --replace 'set(PYTHON_VERSION 3.7)' \
6769 'set(PYTHON_VERSION ${python.pythonVersion})' \
@@ -72,15 +74,7 @@ stdenv.mkDerivation rec {
7274 --replace '${"$"}{LIBDIR}/opencollada' \
7375 '${opencollada}' \
7476 --replace '${"$"}{PYTHON_LIBPATH}/site-packages/numpy' \
75− '${python3Packages.numpy}/${python.sitePackages}/numpy' \
76− --replace 'set(OPENJPEG_INCLUDE_DIRS ' \
77− 'set(OPENJPEG_INCLUDE_DIRS "'$(echo ${openjpeg.dev}/include/openjpeg-*)'") #' \
78− --replace 'set(OPENJPEG_LIBRARIES ' \
79− 'set(OPENJPEG_LIBRARIES "${openjpeg}/lib/libopenjp2.dylib") #' \
80− --replace 'set(OPENIMAGEIO ' \
81− 'set(OPENIMAGEIO "${openimageio2.out}") #' \
82− --replace 'set(OPENEXR_INCLUDE_DIRS ' \
83− 'set(OPENEXR_INCLUDE_DIRS "${openexr.dev}/include/OpenEXR") #'
77+ '${python3Packages.numpy}/${python.sitePackages}/numpy'
8478 '' else ''
8579 substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"'
8680 '');