Merge master into staging-next

2021-03-15 18:16:46 +00:00
parent dec95bae4a 529607debb
commit 4915d2cb4c
38 changed files with 747 additions and 581 deletions
@@ -58,7 +58,9 @@ lib.makeScope pkgs.newScope (self: with self; {
  # Removed from recent GNOME releases, but still required
  scrollkeeper = callPackage ./desktop/scrollkeeper { };

-  gtksourceview = callPackage ./desktop/gtksourceview { };
+  gtksourceview = callPackage ./desktop/gtksourceview {
+    autoreconfHook = pkgs.autoreconfHook269;
+  };

  vte = callPackage ./desktop/vte { };