Merge branch 'release-21.05' into staging-next-21.05

This brings not that many rebuilds but still some.
2021-06-12 07:21:42 +02:00
parent 8e20586f52 20fb587164
commit 6d286be97a
41 changed files with 300 additions and 177 deletions
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
  '';

  mesonFlags = [
-    "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm"
+    "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm,metacity"
    "-Dvariants=light,darker,dark,lighter"
    "-Dcinnamon_version=${cinnamon.cinnamon-common.version}"
    "-Dgnome_shell_version=${gnome.gnome-shell.version}"