Merge branch 'master' into staging-next

Fixed trivial conflicts caused by removing rec.
This commit is contained in:
Jan Tojnar
2019-09-06 03:20:09 +02:00
247 changed files with 3153 additions and 2159 deletions
@@ -19,11 +19,11 @@ stdenv.mkDerivation {
'';
meta = with lib; {
description = "Provides integration for Gtk+ applications into the Mac desktop";
description = "Provides integration for GTK applications into the Mac desktop";
license = licenses.lgpl21;
homepage = https://wiki.gnome.org/Projects/GTK+/OSX/Integration;
homepage = https://wiki.gnome.org/Projects/GTK/OSX/Integration;
maintainers = [ maintainers.matthewbauer ];
platforms = platforms.darwin;