pyrox.dev
blender: fix darwin build
+9
-10
pkgs/applications/misc/blender/darwin.patch
+9
-10
pkgs/applications/misc/blender/darwin.patch
···
1
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
2
-
index 31da529..90308aa 100644
3
--- a/build_files/cmake/platform/platform_apple.cmake
4
+++ b/build_files/cmake/platform/platform_apple.cmake
5
@@ -77,7 +77,6 @@ else()
···
10
endif()
11
12
# Prefer lib directory paths
13
-
@@ -113,10 +112,6 @@ if(WITH_CODEC_SNDFILE)
14
find_library(_sndfile_VORBIS_LIBRARY NAMES vorbis HINTS ${LIBDIR}/ffmpeg/lib)
15
find_library(_sndfile_VORBISENC_LIBRARY NAMES vorbisenc HINTS ${LIBDIR}/ffmpeg/lib)
16
list(APPEND LIBSNDFILE_LIBRARIES
···
21
)
22
23
print_found_status("SndFile libraries" "${LIBSNDFILE_LIBRARIES}")
24
-
@@ -133,7 +128,7 @@ if(WITH_PYTHON)
25
# normally cached but not since we include them with blender
26
-
set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m")
27
-
set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}m")
28
-
- set(PYTHON_LIBRARY ${LIBDIR}/python/lib/libpython${PYTHON_VERSION}m.a)
29
-
+ set(PYTHON_LIBRARY "${LIBDIR}/python/lib/libpython${PYTHON_VERSION}m.dylib")
30
set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}")
31
# set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled
32
else()
33
-
@@ -174,9 +169,7 @@ endif()
34
if(WITH_CODEC_FFMPEG)
35
set(FFMPEG_FIND_COMPONENTS
36
avcodec avdevice avformat avutil
···
41
find_package(FFmpeg)
42
endif()
43
44
-
@@ -267,7 +260,6 @@ if(WITH_BOOST)
45
endif()
46
47
if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG)
···
49
endif()
50
51
if(WITH_PUGIXML)
52
-
@@ -451,7 +443,7 @@ else()
53
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mdynamic-no-pic")
54
endif()
55
···
1
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
2
--- a/build_files/cmake/platform/platform_apple.cmake
3
+++ b/build_files/cmake/platform/platform_apple.cmake
4
@@ -77,7 +77,6 @@ else()
···
9
endif()
10
11
# Prefer lib directory paths
12
+
@@ -114,10 +113,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
···
20
)
21
22
print_found_status("SndFile libraries" "${LIBSNDFILE_LIBRARIES}")
23
+
@@ -134,7 +129,7 @@ if(WITH_PYTHON)
24
# normally cached but not since we include them with blender
25
+
set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}")
26
+
set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}")
27
+
- set(PYTHON_LIBRARY ${LIBDIR}/python/lib/libpython${PYTHON_VERSION}.a)
28
+
+ set(PYTHON_LIBRARY ${LIBDIR}/python/lib/libpython${PYTHON_VERSION}.dylib)
29
set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}")
30
# set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled
31
else()
32
+
@@ -175,9 +170,7 @@ endif()
33
if(WITH_CODEC_FFMPEG)
34
set(FFMPEG_FIND_COMPONENTS
35
avcodec avdevice avformat avutil
···
40
find_package(FFmpeg)
41
endif()
42
43
+
@@ -275,7 +268,6 @@ if(WITH_BOOST)
44
endif()
45
46
if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG)
···
48
endif()
49
50
if(WITH_PUGIXML)
51
+
@@ -476,7 +468,7 @@ else()
52
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mdynamic-no-pic")
53
endif()
54
-4
pkgs/applications/misc/blender/default.nix
-4
pkgs/applications/misc/blender/default.nix
···
78
--replace '${"$"}{LIBDIR}/openmp' \
79
'${llvmPackages.openmp}'
80
substituteInPlace build_files/cmake/platform/platform_apple.cmake \
81
-
--replace 'set(PYTHON_VERSION 3.7)' \
82
-
'set(PYTHON_VERSION ${python.pythonVersion})' \
83
-
--replace '${"$"}{PYTHON_VERSION}m' \
84
-
'${"$"}{PYTHON_VERSION}' \
85
--replace '${"$"}{LIBDIR}/python' \
86
'${python}' \
87
--replace '${"$"}{LIBDIR}/opencollada' \