diff options
author | Will Dietz <w@wdtz.org> | 2018-12-31 11:00:03 -0600 |
---|---|---|
committer | Will Dietz <w@wdtz.org> | 2018-12-31 11:00:03 -0600 |
commit | 471804736d2187b41b3e49cdefa1dadf11b423ed (patch) | |
tree | 588649c76a1c40a0bf2a5a1ab95f0b22d49976ff | |
parent | d349cfee88384b4cc353dba8d1154f230520bcc4 (diff) | |
download | nixlib-471804736d2187b41b3e49cdefa1dadf11b423ed.tar nixlib-471804736d2187b41b3e49cdefa1dadf11b423ed.tar.gz nixlib-471804736d2187b41b3e49cdefa1dadf11b423ed.tar.bz2 nixlib-471804736d2187b41b3e49cdefa1dadf11b423ed.tar.lz nixlib-471804736d2187b41b3e49cdefa1dadf11b423ed.tar.xz nixlib-471804736d2187b41b3e49cdefa1dadf11b423ed.tar.zst nixlib-471804736d2187b41b3e49cdefa1dadf11b423ed.zip |
ffmpeg-full: use cf-private to fix Darwin build
-rw-r--r-- | pkgs/development/libraries/ffmpeg-full/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index d20d7a9e6b25..202ca502d688 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -140,7 +140,7 @@ * Darwin frameworks */ , Cocoa, CoreAudio, CoreServices, AVFoundation, MediaToolbox -, VideoDecodeAcceleration, CF +, VideoDecodeAcceleration, cf-private }: /* Maintainer notes: @@ -434,7 +434,7 @@ stdenv.mkDerivation rec { FILES+=($(ls $out/lib/*.dylib)) for f in ''${FILES[@]}; do 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 done ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0ccf05902d1..5170802e046a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9731,7 +9731,7 @@ 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; + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices CoreAudio AVFoundation MediaToolbox VideoDecodeAcceleration; |