Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
Martin Weinelt
2021-05-08 14:43:43 +02:00
657 changed files with 2572 additions and 1628 deletions
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, file, glibmm, gst_all_1, gnome3 }:
{ lib, stdenv, fetchurl, pkg-config, file, glibmm, gst_all_1, gnome }:
stdenv.mkDerivation rec {
pname = "gstreamermm";
version = "1.10.0";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = "gst_all_1.gstreamermm";
versionPolicy = "odd-unstable";
};