public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ffmpeg-full: remove cf-private

This commit is contained in:
Daiderd Jordan 2019-06-19 20:01:18 +02:00
parent 7fffb620ac
commit 6f16de27d2
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/ffmpeg-full/default.nix
View File

@ -139,7 +139,7 @@
* Darwin frameworks * Darwin frameworks
*/ */
, Cocoa, CoreAudio, CoreServices, AVFoundation, MediaToolbox , Cocoa, CoreAudio, CoreServices, AVFoundation, MediaToolbox
, VideoDecodeAcceleration, cf-private , VideoDecodeAcceleration
}: }:
/* Maintainer notes: /* Maintainer notes:
@ -419,7 +419,7 @@ stdenv.mkDerivation rec {
++ optional nvenc nv-codec-headers ++ optional nvenc nv-codec-headers
++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation
MediaToolbox VideoDecodeAcceleration MediaToolbox VideoDecodeAcceleration
libiconv cf-private /* For _OBJC_EHTYPE_$_NSException */ ]; libiconv ];
buildFlags = [ "all" ] buildFlags = [ "all" ]
++ optional qtFaststartProgram "tools/qt-faststart"; # Build qt-faststart executable ++ 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 # Hacky framework patching technique borrowed from the phantomjs2 package
postInstall = optionalString qtFaststartProgram '' postInstall = optionalString qtFaststartProgram ''
cp -a tools/qt-faststart $out/bin/ 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; enableParallelBuilding = true;

1
pkgs/top-level/all-packages.nix
View File

@ -10389,7 +10389,6 @@ in
vid-stab = if stdenv.isDarwin then null else vid-stab; vid-stab = if stdenv.isDarwin then null else vid-stab;
x265 = if stdenv.isDarwin then null else x265; x265 = if stdenv.isDarwin then null else x265;
xavs = if stdenv.isDarwin then null else xavs; xavs = if stdenv.isDarwin then null else xavs;
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) inherit (darwin.apple_sdk.frameworks)
Cocoa CoreServices CoreAudio AVFoundation MediaToolbox Cocoa CoreServices CoreAudio AVFoundation MediaToolbox
VideoDecodeAcceleration; VideoDecodeAcceleration;