Unverified Commit 0f7d42cf authored by Alyssa Ross's avatar Alyssa Ross
Browse files

dino: re-add gst-plugins-good input 

This was previously removed when experimental features in Dino were
disabled, along with other dependencies required for those.  Unlike
the others, though, VP9 is a stable feature, which we inadvertently
lost when making that change.  This is therefore a partial revert of
that change.

Fixes: ccc6c1ca ("dino: disable optional features per default as they are experimental")
Closes: https://github.com/NixOS/nixpkgs/issues/497706
parent 4b2ae98e

pkgs/applications/networking/instant-messengers/dino/default.nix

+6 −3
Original line number Diff line number Diff line
@@ -27,7 +27,9 @@ 
  srtp,

  libnice,

  gnutls,

  gst_all_1,

  gstreamer,

  gst-plugins-base,

  gst-plugins-good,

  webrtc-audio-processing,

}:
@@ -79,8 +81,9 @@ stdenv.mkDerivation (finalAttrs: { 
    srtp

    libnice

    gnutls

    gst_all_1.gstreamer

    gst_all_1.gst-plugins-base

    gstreamer

    gst-plugins-base

    gst-plugins-good # contains rtpbin, required for VP9

    webrtc-audio-processing

  ];

pkgs/top-level/all-packages.nix

+7 −1
Original line number Diff line number Diff line
@@ -1672,7 +1672,13 @@ with pkgs; 
    plugins = lib.filter (p: p ? pluginName) (builtins.attrValues discourse.plugins);

  };



  dino = callPackage ../applications/networking/instant-messengers/dino { };

  dino = callPackage ../applications/networking/instant-messengers/dino {

    inherit (gst_all_1)

      gstreamer

      gst-plugins-base

      ;

    gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };

  };



  inherit (ocamlPackages) dot-merlin-reader;