Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-08-03 13:34:44 +00:00
parent 3f9e8601f2 d93f917182
commit 1b979d8384
1099 changed files with 2664 additions and 513 deletions
--- a/pkgs/misc/emulators/uae/default.nix
+++ b/pkgs/misc/emulators/uae/default.nix
@@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
    license = stdenv.lib.licenses.gpl2Plus;
    homepage = http://web.archive.org/web/20130901222855/http://www.amigaemulator.org/;
    maintainers = [ stdenv.lib.maintainers.sander ];
+    platforms = stdenv.lib.platforms.linux;
  };
 }