diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2020-12-05 18:23:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-05 18:23:58 -0500 |
| commit | 30fbc30610b9bc5dcbf96fa6580526f6184493b9 (patch) | |
| tree | 3df304f20edeb69a562d918c2a57e09c1583987c | |
| parent | 65238694587b4b3e2f98dd4ba39c4d8697dbeec5 (diff) | |
| parent | 1b3f09008b51ac819a9fcc8e9979929c4f8aa63b (diff) | |
Merge pull request #105999 from midchildan/feat/ffmpeg-darwin-x265
ffmpeg-full: re-enable encoders on macOS
| -rw-r--r-- | pkgs/development/libraries/ffmpeg-full/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index df7043cd44ed..a2f5e366e008 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -164,9 +164,8 @@ * utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video * * Need fixes to support Darwin: - * frei0r game-music-emu gsm libjack2 libmfx(intel-media-sdk) libssh - * libvpx(stable 1.3.0) openal openjpeg pulseaudio rtmpdump samba vid-stab - * wavpack x265 xavs + * gsm libjack2 libmodplug libmfx(intel-media-sdk) nvenc pulseaudio samba + * vid-stab * * Need fixes to support AArch64: * libmfx(intel-media-sdk) nvenc diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e9468a10da7..fa109ec49a4f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12784,18 +12784,12 @@ in ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { # The following need to be fixed on Darwin - frei0r = if stdenv.isDarwin then null else frei0r; - game-music-emu = if stdenv.isDarwin then null else game-music-emu; libjack2 = if stdenv.isDarwin then null else libjack2; libmodplug = if stdenv.isDarwin then null else libmodplug; - openal = if stdenv.isDarwin then null else openal; libmfx = if stdenv.isDarwin then null else intel-media-sdk; libpulseaudio = if stdenv.isDarwin then null else libpulseaudio; - rav1e = if stdenv.isDarwin then null else rav1e; samba = if stdenv.isDarwin then null else samba; 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.apple_sdk.frameworks) Cocoa CoreServices CoreAudio AVFoundation MediaToolbox VideoDecodeAcceleration; |