diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2019-01-19 16:56:21 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2019-01-19 16:56:21 +0100 |
commit | b277551a4be8c4402f224543379ce91b1c9f1c5f (patch) | |
tree | 2b00880b8dce9ff81c635d38a50a9339537fe538 /pkgs/top-level | |
parent | 23eb5e846d0dfd6825d788b19f6221985e074570 (diff) | |
parent | 19d6c32fcf216a9312c99dc2d9896bd26c09d0f3 (diff) | |
download | nixpkgs-b277551a4be8c4402f224543379ce91b1c9f1c5f.tar nixpkgs-b277551a4be8c4402f224543379ce91b1c9f1c5f.tar.gz nixpkgs-b277551a4be8c4402f224543379ce91b1c9f1c5f.tar.bz2 nixpkgs-b277551a4be8c4402f224543379ce91b1c9f1c5f.tar.lz nixpkgs-b277551a4be8c4402f224543379ce91b1c9f1c5f.tar.xz nixpkgs-b277551a4be8c4402f224543379ce91b1c9f1c5f.tar.zst nixpkgs-b277551a4be8c4402f224543379ce91b1c9f1c5f.zip |
Merge #52444: ffmpeg{_3_4,_4,-full}: updates
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a5b46ed862..3d3b660fe4f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9752,7 +9752,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; |