Merge branch 'staging-next' into staging

2021-05-08 20:59:05 +02:00
parent 252bf94a74 6d46d8a9b9
commit dd78ce1c53
730 changed files with 3907 additions and 1907 deletions
@@ -1,5 +1,5 @@
 { lib, python3Packages, fetchFromGitHub, libxslt,
-  gobject-introspection, gtk3, wrapGAppsHook, gnome3 }:
+  gobject-introspection, gtk3, wrapGAppsHook, gnome }:

 python3Packages.buildPythonApplication rec {
  pname = "wpgtk";
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
    wrapGAppsHook
    gtk3
    gobject-introspection
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
    libxslt
  ];

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
    homepage = "http://freedesktop.org/wiki/Software/xdg-user-dirs";
    description = "A tool to help manage well known user directories like the desktop folder and the music folder";
    license = licenses.gpl2;
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = with maintainers; [ ];
    platforms = platforms.linux;
  };
 }