mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-12 20:55:31 +03:00
ffmpeg_{4,6,7}: clean up old Darwin SDK pattern
This commit is contained in:
parent
b0e7b99a77
commit
49e79fb615
2 changed files with 2 additions and 21 deletions
|
@ -9,14 +9,6 @@ let
|
|||
initArgs: ffmpegVariant:
|
||||
callPackage ./generic.nix (
|
||||
{
|
||||
inherit (darwin.apple_sdk.frameworks)
|
||||
Accelerate
|
||||
AppKit
|
||||
AudioToolbox
|
||||
AVFoundation
|
||||
CoreImage
|
||||
VideoToolbox
|
||||
;
|
||||
inherit (darwin) xcode;
|
||||
inherit (cudaPackages) cuda_cudart cuda_nvcc libnpp;
|
||||
}
|
||||
|
|
|
@ -333,14 +333,8 @@
|
|||
, zlib
|
||||
, zvbi
|
||||
/*
|
||||
* Darwin frameworks
|
||||
* Darwin
|
||||
*/
|
||||
, Accelerate
|
||||
, AppKit
|
||||
, AudioToolbox
|
||||
, AVFoundation
|
||||
, CoreImage
|
||||
, VideoToolbox
|
||||
, xcode # unfree contains metalcc and metallib
|
||||
/*
|
||||
* Cuda Packages
|
||||
|
@ -735,12 +729,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
++ optionals withAlsa [ alsa-lib ]
|
||||
++ optionals withAmf [ amf-headers ]
|
||||
++ optionals withAom [ libaom ]
|
||||
++ optionals withAppKit [ AppKit ]
|
||||
++ optionals withAribb24 [ aribb24 ]
|
||||
++ optionals withAribcaption [ libaribcaption ]
|
||||
++ optionals withAss [ libass ]
|
||||
++ optionals withAudioToolbox [ AudioToolbox ]
|
||||
++ optionals withAvFoundation [ AVFoundation ]
|
||||
++ optionals withAvisynth [ avisynthplus ]
|
||||
++ optionals withBluray [ libbluray ]
|
||||
++ optionals withBs2b [ libbs2b ]
|
||||
|
@ -750,7 +741,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
++ optionals withCelt [ celt ]
|
||||
++ optionals withChromaprint [ chromaprint ]
|
||||
++ optionals withCodec2 [ codec2 ]
|
||||
++ optionals withCoreImage [ CoreImage ]
|
||||
++ optionals withCudaNVCC [ cuda_cudart cuda_nvcc ]
|
||||
++ optionals withDav1d [ dav1d ]
|
||||
++ optionals withDc1394 [ libdc1394 libraw1394 ]
|
||||
|
@ -794,7 +784,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
++ optionals withQuirc [ quirc ]
|
||||
++ optionals withRav1e [ rav1e ]
|
||||
++ optionals withRtmp [ rtmpdump ]
|
||||
++ optionals withRubberband ([ rubberband ] ++ lib.optional stdenv.hostPlatform.isDarwin Accelerate)
|
||||
++ optionals withRubberband [ rubberband ]
|
||||
++ optionals withSamba [ samba ]
|
||||
++ optionals withSdl2 [ SDL2 ]
|
||||
++ optionals withShaderc [ shaderc ]
|
||||
|
@ -812,7 +802,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
++ optionals withV4l2 [ libv4l ]
|
||||
++ optionals withVaapi [ (if withSmallDeps then libva else libva-minimal) ]
|
||||
++ optionals withVdpau [ libvdpau ]
|
||||
++ optionals withVideoToolbox [ VideoToolbox ]
|
||||
++ optionals withVidStab [ vid-stab ]
|
||||
++ optionals withVmaf [ libvmaf ]
|
||||
++ optionals withVoAmrwbenc [ vo-amrwbenc ]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue