Commit ff163568 authored by Bryan Honof's avatar Bryan Honof Committed by Silvan Mosberger
Browse files

gst_all_1: convert to scope 

These packages make sense, at least to me, to live inside of a scope. That way
we can also extend the scope with other gst plugins without too much hassel.
parent d632d88f

pkgs/development/libraries/gstreamer/default.nix

+29 −32
Original line number Diff line number Diff line 
{

  config,

  lib,

  callPackage,

  ipu6ep-camera-hal,

  ipu6epmtl-camera-hal,

  newScope,

  apple-sdk,

}:



lib.makeScope newScope (

  self:

  let

  apple-sdk_gstreamer = apple-sdk;

    inherit (self) callPackage;

  in

  {

  inherit apple-sdk_gstreamer;

    apple-sdk_gstreamer = apple-sdk;



    gstreamer = callPackage ./core { };
@@ -38,15 +38,12 @@ in 
    gst-vaapi = callPackage ./vaapi { };



    icamerasrc-ipu6 = callPackage ./icamerasrc { };

  icamerasrc-ipu6ep = callPackage ./icamerasrc {

    ipu6-camera-hal = ipu6ep-camera-hal;

  };

  icamerasrc-ipu6epmtl = callPackage ./icamerasrc {

    ipu6-camera-hal = ipu6epmtl-camera-hal;

  };

    icamerasrc-ipu6ep = callPackage ./icamerasrc { };

    icamerasrc-ipu6epmtl = callPackage ./icamerasrc { };



    # note: gst-python is in ../../python-modules/gst-python - called under python3Packages

  }

  // lib.optionalAttrs config.allowAliases {

    gst-plugins-viperfx = throw "'gst_all_1.gst-plugins-viperfx' was removed as it is broken and not maintained upstream"; # Added 2024-12-16

  }

)

pkgs/top-level/all-packages.nix

+1 −5
Original line number Diff line number Diff line
@@ -7328,11 +7328,7 @@ with pkgs; 


  gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { };



  gst_all_1 = recurseIntoAttrs (

    callPackage ../development/libraries/gstreamer {

      callPackage = newScope gst_all_1;

    }

  );

  gst_all_1 = recurseIntoAttrs (callPackage ../development/libraries/gstreamer { });



  gnutls = callPackage ../development/libraries/gnutls {

    util-linux = util-linuxMinimal; # break the cyclic dependency