Merge master into staging-next

2020-12-29 00:51:31 +00:00
parent ac03278035 9154eda951
commit c86ce50258
44 changed files with 445 additions and 254 deletions
@@ -26,15 +26,6 @@ stdenv.mkDerivation rec {
    sha256 = "097dw1l92l73xah9l56ka5mi3dvx48ffpiv33ni5i5rqw0ng7fc4";
  };

-  patches = [
-    # Fix build with Meson 0.55
-    # https://gitlab.gnome.org/GNOME/iagno/-/issues/16
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/iagno/commit/0100bab269f2102f24a6e41202b931da1b6e8dc5.patch";
-      sha256 = "ZW75s+bV45ivwA+SKUN7ejSvnXYEo/kYQjDVvFBA/sg=";
-    })
-  ];
-
  nativeBuildInputs = [
    meson
    ninja