movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-22 01:11:02 +03:00
Code Activity

ffmpeg_{4,6,7}: clean up old Darwin SDK pattern

Browse source
This commit is contained in:
Emily 2024-10-25 00:32:02 +01:00
parent b0e7b99a77
commit 49e79fb615
2 changed files with 2 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/libraries/ffmpeg/default.nix
View file

@ -9,14 +9,6 @@ let
initArgs: ffmpegVariant: initArgs: ffmpegVariant:
callPackage ./generic.nix ( callPackage ./generic.nix (
{ {
inherit (darwin.apple_sdk.frameworks)
Accelerate
AppKit
AudioToolbox
AVFoundation
CoreImage
VideoToolbox
;
inherit (darwin) xcode; inherit (darwin) xcode;
inherit (cudaPackages) cuda_cudart cuda_nvcc libnpp; inherit (cudaPackages) cuda_cudart cuda_nvcc libnpp;
} }

15
pkgs/development/libraries/ffmpeg/generic.nix
View file

@ -333,14 +333,8 @@
, zlib , zlib
, zvbi , zvbi
/* /*
* Darwin frameworks * Darwin
*/ */
, Accelerate
, AppKit
, AudioToolbox
, AVFoundation
, CoreImage
, VideoToolbox
, xcode # unfree contains metalcc and metallib , xcode # unfree contains metalcc and metallib
/* /*
* Cuda Packages * Cuda Packages
@ -735,12 +729,9 @@ stdenv.mkDerivation (finalAttrs: {
++ optionals withAlsa [ alsa-lib ] ++ optionals withAlsa [ alsa-lib ]
++ optionals withAmf [ amf-headers ] ++ optionals withAmf [ amf-headers ]
++ optionals withAom [ libaom ] ++ optionals withAom [ libaom ]
++ optionals withAppKit [ AppKit ]
++ optionals withAribb24 [ aribb24 ] ++ optionals withAribb24 [ aribb24 ]
++ optionals withAribcaption [ libaribcaption ] ++ optionals withAribcaption [ libaribcaption ]
++ optionals withAss [ libass ] ++ optionals withAss [ libass ]
++ optionals withAudioToolbox [ AudioToolbox ]
++ optionals withAvFoundation [ AVFoundation ]
++ optionals withAvisynth [ avisynthplus ] ++ optionals withAvisynth [ avisynthplus ]
++ optionals withBluray [ libbluray ] ++ optionals withBluray [ libbluray ]
++ optionals withBs2b [ libbs2b ] ++ optionals withBs2b [ libbs2b ]
@ -750,7 +741,6 @@ stdenv.mkDerivation (finalAttrs: {
++ optionals withCelt [ celt ] ++ optionals withCelt [ celt ]
++ optionals withChromaprint [ chromaprint ] ++ optionals withChromaprint [ chromaprint ]
++ optionals withCodec2 [ codec2 ] ++ optionals withCodec2 [ codec2 ]
++ optionals withCoreImage [ CoreImage ]
++ optionals withCudaNVCC [ cuda_cudart cuda_nvcc ] ++ optionals withCudaNVCC [ cuda_cudart cuda_nvcc ]
++ optionals withDav1d [ dav1d ] ++ optionals withDav1d [ dav1d ]
++ optionals withDc1394 [ libdc1394 libraw1394 ] ++ optionals withDc1394 [ libdc1394 libraw1394 ]
@ -794,7 +784,7 @@ stdenv.mkDerivation (finalAttrs: {
++ optionals withQuirc [ quirc ] ++ optionals withQuirc [ quirc ]
++ optionals withRav1e [ rav1e ] ++ optionals withRav1e [ rav1e ]
++ optionals withRtmp [ rtmpdump ] ++ optionals withRtmp [ rtmpdump ]
++ optionals withRubberband ([ rubberband ] ++ lib.optional stdenv.hostPlatform.isDarwin Accelerate) ++ optionals withRubberband [ rubberband ]
++ optionals withSamba [ samba ] ++ optionals withSamba [ samba ]
++ optionals withSdl2 [ SDL2 ] ++ optionals withSdl2 [ SDL2 ]
++ optionals withShaderc [ shaderc ] ++ optionals withShaderc [ shaderc ]
@ -812,7 +802,6 @@ stdenv.mkDerivation (finalAttrs: {
++ optionals withV4l2 [ libv4l ] ++ optionals withV4l2 [ libv4l ]
++ optionals withVaapi [ (if withSmallDeps then libva else libva-minimal) ] ++ optionals withVaapi [ (if withSmallDeps then libva else libva-minimal) ]
++ optionals withVdpau [ libvdpau ] ++ optionals withVdpau [ libvdpau ]
++ optionals withVideoToolbox [ VideoToolbox ]
++ optionals withVidStab [ vid-stab ] ++ optionals withVidStab [ vid-stab ]
++ optionals withVmaf [ libvmaf ] ++ optionals withVmaf [ libvmaf ]
++ optionals withVoAmrwbenc [ vo-amrwbenc ] ++ optionals withVoAmrwbenc [ vo-amrwbenc ]