gst_all_1: get all dependencies via callPackage

The use of `rec` would bypass callPackage's machinery for gstreamer
interdependencies and hinder overrides via overlays.
This commit is contained in:
arcnmx 2021-07-23 17:13:20 -07:00
parent b09661d41f
commit c3822ddb58
2 changed files with 11 additions and 13 deletions

View file

@ -1,29 +1,27 @@
{ callPackage, AudioToolbox, AVFoundation, Cocoa, CoreFoundation, CoreMedia, CoreServices, CoreVideo, DiskArbitration, Foundation, IOKit, MediaToolbox, OpenGL, VideoToolbox }:
rec {
{
gstreamer = callPackage ./core { inherit CoreServices; };
gstreamermm = callPackage ./gstreamermm { };
gst-plugins-base = callPackage ./base { inherit gstreamer Cocoa OpenGL; };
gst-plugins-base = callPackage ./base { inherit Cocoa OpenGL; };
gst-plugins-good = callPackage ./good { inherit gst-plugins-base Cocoa; };
gst-plugins-good = callPackage ./good { inherit Cocoa; };
gst-plugins-bad = callPackage ./bad { inherit gst-plugins-base AudioToolbox AVFoundation CoreMedia CoreVideo Foundation MediaToolbox VideoToolbox; };
gst-plugins-bad = callPackage ./bad { inherit AudioToolbox AVFoundation CoreMedia CoreVideo Foundation MediaToolbox VideoToolbox; };
gst-plugins-ugly = callPackage ./ugly { inherit gst-plugins-base CoreFoundation DiskArbitration IOKit; };
gst-plugins-ugly = callPackage ./ugly { inherit CoreFoundation DiskArbitration IOKit; };
gst-rtsp-server = callPackage ./rtsp-server { inherit gst-plugins-base gst-plugins-bad; };
gst-rtsp-server = callPackage ./rtsp-server { };
gst-libav = callPackage ./libav { inherit gst-plugins-base; };
gst-libav = callPackage ./libav { };
gst-devtools = callPackage ./devtools { inherit gstreamer gst-plugins-base; };
gst-devtools = callPackage ./devtools { };
gst-editing-services = callPackage ./ges { inherit gst-plugins-base gst-plugins-bad gst-devtools; };
gst-editing-services = callPackage ./ges { };
gst-vaapi = callPackage ./vaapi {
inherit gst-plugins-base gstreamer gst-plugins-bad;
};
gst-vaapi = callPackage ./vaapi { };
# note: gst-python is in ./python/default.nix - called under pythonPackages
}

View file

@ -15533,7 +15533,7 @@ in
gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { };
gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer {
callPackage = newScope { libav = pkgs.ffmpeg; };
callPackage = newScope (gst_all_1 // { libav = pkgs.ffmpeg; });
inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Cocoa CoreFoundation CoreMedia CoreServices CoreVideo DiskArbitration Foundation IOKit MediaToolbox OpenGL VideoToolbox;
});