ffmpeg: cleanup darwin frameworks
This commit is contained in:
parent
8bbb3e7f23
commit
8d6cdd8aba
3 changed files with 6 additions and 17 deletions
|
@ -1,17 +1,12 @@
|
|||
{ callPackage, fetchpatch
|
||||
# Darwin frameworks
|
||||
, Cocoa, CoreMedia, VideoToolbox
|
||||
, stdenv, lib
|
||||
, ...
|
||||
}@args:
|
||||
{ callPackage, fetchpatch, ... }@args:
|
||||
|
||||
callPackage ./generic.nix (rec {
|
||||
version = "4.4.2";
|
||||
branch = version;
|
||||
sha256 = "sha256-+YpIJSDEdQdSGpB5FNqp77wThOBZG1r8PaGKqJfeKUg=";
|
||||
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
|
||||
|
||||
patches = [
|
||||
# sdl2 recently changed their versioning
|
||||
# SDL2 recently changed their versioning
|
||||
(fetchpatch {
|
||||
url = "https://git.videolan.org/?p=ffmpeg.git;a=patch;h=e5163b1d34381a3319214a902ef1df923dd2eeba";
|
||||
hash = "sha256-nLhP2+34cj5EgpnUrePZp60nYAxmbhZAEDfay4pBVk0=";
|
||||
|
|
|
@ -1,12 +1,7 @@
|
|||
{ callPackage
|
||||
# Darwin frameworks
|
||||
, Cocoa, CoreMedia, VideoToolbox
|
||||
, ...
|
||||
}@args:
|
||||
{ callPackage, ... }@args:
|
||||
|
||||
callPackage ./generic.nix (rec {
|
||||
version = "5.1.2";
|
||||
branch = version;
|
||||
sha256 = "sha256-OaC8yNmFSfFsVwYkZ4JGpqxzbAZs69tAn5UC6RWyLys=";
|
||||
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
|
||||
} // args)
|
||||
|
|
|
@ -15,8 +15,7 @@
|
|||
, debugDeveloper ? false
|
||||
, optimizationsDeveloper ? true
|
||||
, extraWarningsDeveloper ? false
|
||||
# Darwin frameworks
|
||||
, Cocoa, darwinFrameworks ? [ Cocoa ]
|
||||
, Cocoa, CoreMedia, VideoToolbox
|
||||
# Inherit generics
|
||||
, branch, sha256, version, patches ? [], knownVulnerabilities ? []
|
||||
, doCheck ? true
|
||||
|
@ -185,7 +184,7 @@ stdenv.mkDerivation rec {
|
|||
++ optional ((isLinux || isFreeBSD) && !isAarch32) libva
|
||||
++ optional ((isLinux || isFreeBSD) && !isAarch32) libdrm
|
||||
++ optional isLinux alsa-lib
|
||||
++ optionals isDarwin darwinFrameworks
|
||||
++ optionals isDarwin [ Cocoa CoreMedia VideoToolbox ]
|
||||
++ optional vdpauSupport libvdpau
|
||||
++ optional sdlSupport (if reqMin "3.2" then SDL2 else SDL)
|
||||
++ optional (reqMin "4.2") dav1d;
|
||||
|
|
Loading…
Reference in a new issue