Merge branch 'master' into staging-next

2021-04-16 01:32:09 +02:00
parent dfd4f14303 22fb4458c0
commit cd7a519012
42 changed files with 753 additions and 203 deletions
@@ -394,10 +394,6 @@ in
    '';
  };

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