Merge staging-next into staging

2021-03-07 00:41:13 +00:00
parent 6329ac8111 5ae3107a21
commit f9d4095295
50 changed files with 368 additions and 146 deletions
--- a/pkgs/misc/emulators/libdsk/default.nix
+++ b/pkgs/misc/emulators/libdsk/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
    homepage = "http://www.seasip.info/Unix/LibDsk/";
    license = licenses.gpl2Plus;
    maintainers = [ ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }
--- a/pkgs/misc/emulators/mednafen/server.nix
+++ b/pkgs/misc/emulators/mednafen/server.nix
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
    homepage = "https://mednafen.github.io/";
    license = licenses.gpl2;
    maintainers = with maintainers; [ AndersonTorres ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }