Merge branch 'master' into staging-next

2021-01-15 17:46:46 +01:00
parent 83c50873f5 bb96017198
commit c0d2951fa6
1804 changed files with 7434 additions and 5627 deletions
@@ -172,7 +172,7 @@ let
        desktopName = "${desktopName}${nameSuffix}${lib.optionalString forceWayland " (Wayland)"}";
        genericName = "Web Browser";
        categories = "Network;WebBrowser;";
-        mimeType = stdenv.lib.concatStringsSep ";" [
+        mimeType = lib.concatStringsSep ";" [
          "text/html"
          "text/xml"
          "application/xhtml+xml"