ffmpeg-full: remove cf-private
This commit is contained in:
parent
7fffb620ac
commit
6f16de27d2
@ -139,7 +139,7 @@
|
||||
* Darwin frameworks
|
||||
*/
|
||||
, Cocoa, CoreAudio, CoreServices, AVFoundation, MediaToolbox
|
||||
, VideoDecodeAcceleration, cf-private
|
||||
, VideoDecodeAcceleration
|
||||
}:
|
||||
|
||||
/* Maintainer notes:
|
||||
@ -419,7 +419,7 @@ stdenv.mkDerivation rec {
|
||||
++ optional nvenc nv-codec-headers
|
||||
++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation
|
||||
MediaToolbox VideoDecodeAcceleration
|
||||
libiconv cf-private /* For _OBJC_EHTYPE_$_NSException */ ];
|
||||
libiconv ];
|
||||
|
||||
buildFlags = [ "all" ]
|
||||
++ optional qtFaststartProgram "tools/qt-faststart"; # Build qt-faststart executable
|
||||
@ -427,14 +427,6 @@ stdenv.mkDerivation rec {
|
||||
# Hacky framework patching technique borrowed from the phantomjs2 package
|
||||
postInstall = optionalString qtFaststartProgram ''
|
||||
cp -a tools/qt-faststart $out/bin/
|
||||
'' + optionalString stdenv.isDarwin ''
|
||||
FILES=($(ls $out/bin/*))
|
||||
FILES+=($(ls $out/lib/*.dylib))
|
||||
for f in ''${FILES[@]}; do
|
||||
if [ ! -h "$f" ]; then
|
||||
install_name_tool -change ${cf-private}/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation "$f"
|
||||
fi
|
||||
done
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
@ -10389,7 +10389,6 @@ in
|
||||
vid-stab = if stdenv.isDarwin then null else vid-stab;
|
||||
x265 = if stdenv.isDarwin then null else x265;
|
||||
xavs = if stdenv.isDarwin then null else xavs;
|
||||
inherit (darwin) cf-private;
|
||||
inherit (darwin.apple_sdk.frameworks)
|
||||
Cocoa CoreServices CoreAudio AVFoundation MediaToolbox
|
||||
VideoDecodeAcceleration;
|
||||
|
Loading…
Reference in New Issue
Block a user