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

ffmpeg-full: use cf-private to fix Darwin build

Browse Source
This commit is contained in:
Will Dietz 2018-12-31 11:00:03 -06:00
parent d349cfee88
commit 471804736d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,7 +140,7 @@
* Darwin frameworks * Darwin frameworks
*/ */
, Cocoa, CoreAudio, CoreServices, AVFoundation, MediaToolbox , Cocoa, CoreAudio, CoreServices, AVFoundation, MediaToolbox
, VideoDecodeAcceleration, CF , VideoDecodeAcceleration, cf-private
}: }:
/* Maintainer notes: /* Maintainer notes:
@ -434,7 +434,7 @@ stdenv.mkDerivation rec {
FILES+=($(ls $out/lib/*.dylib)) FILES+=($(ls $out/lib/*.dylib))
for f in ''${FILES[@]}; do for f in ''${FILES[@]}; do
if [ ! -h "$f" ]; then if [ ! -h "$f" ]; then
install_name_tool -change ${CF}/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation "$f" install_name_tool -change ${cf-private}/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation "$f"
fi fi
done done
''; '';

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

@ -9731,7 +9731,7 @@ 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; 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;