Merge master into staging-next

2021-04-15 18:13:27 +00:00
parent 80e725f3dc bc5c0c559f
commit dfd4f14303
48 changed files with 498 additions and 256 deletions
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -394,6 +394,10 @@ in
    '';
  };

+  mimemagic = attrs: {
+    FREEDESKTOP_MIME_TYPES_PATH="${shared-mime-info}/share/mime/packages/freedesktop.org.xml";
+  };
+
  msgpack = attrs: {
    buildInputs = [ msgpack ];
  };