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

18 files changed, 28 insertions, 6 deletions

diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/misc/emulators/atari++/default.nix
index 89baadb62082..9d4a142cf2e0 100644
--- a/pkgs/misc/emulators/atari++/default.nix
+++ b/pkgs/misc/emulators/atari++/default.nix
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec{
       (Linux, Solaris, Irix).
     '';
     maintainers = [ maintainers.AndersonTorres ];
-    license = licenses.gpl2Plus;    
-  };    
+    license = licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.linux;
+  };
 }
diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix
index af8d64982a0b..1cf52368d62d 100644
--- a/pkgs/misc/emulators/atari800/default.nix
+++ b/pkgs/misc/emulators/atari800/default.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec{
       other systems supported by the SDL library.
     '';
     maintainers = [ maintainers.AndersonTorres ];
-    license = licenses.gpl2Plus;    
-  };    
+    license = licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.linux;
+  };
 }
diff --git a/pkgs/misc/emulators/dlx/default.nix b/pkgs/misc/emulators/dlx/default.nix
index 60854f8550b8..01c5f866e1b0 100644
--- a/pkgs/misc/emulators/dlx/default.nix
+++ b/pkgs/misc/emulators/dlx/default.nix
@@ -24,5 +24,6 @@ stdenv.mkDerivation {
     homepage = "http://www.davidviner.com/dlx.php";
     description = "DLX Simulator";
     license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix
index 53588cfd70b3..f7400e4b7615 100644
--- a/pkgs/misc/emulators/dosbox/default.nix
+++ b/pkgs/misc/emulators/dosbox/default.nix
@@ -39,5 +39,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.dosbox.com/;
     description = "A DOS emulator";
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix
index 529e5d3d0a22..57a5591f93a2 100644
--- a/pkgs/misc/emulators/emulationstation/default.nix
+++ b/pkgs/misc/emulators/emulationstation/default.nix
@@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
     homepage = "http://emulationstation.org";
     maintainers = [ stdenv.lib.maintainers.edwtjo ];
     license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/misc/emulators/fakenes/default.nix b/pkgs/misc/emulators/fakenes/default.nix
index 5462f7727033..1f986430b81d 100644
--- a/pkgs/misc/emulators/fakenes/default.nix
+++ b/pkgs/misc/emulators/fakenes/default.nix
@@ -24,5 +24,6 @@ stdenv.mkDerivation {
     homepage = http://fakenes.sourceforge.net/;
     license = stdenv.lib.licenses.gpl2Plus;
     description = "Portable Open Source NES Emulator";
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/misc/emulators/fceux/default.nix
index 64d5dfd69a7b..42469c5daf4a 100644
--- a/pkgs/misc/emulators/fceux/default.nix
+++ b/pkgs/misc/emulators/fceux/default.nix
@@ -30,5 +30,6 @@ stdenv.mkDerivation {
     description = "A Nintendo Entertainment System (NES) Emulator";
     license = stdenv.lib.licenses.gpl2;
     homepage = http://www.fceux.com/;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix
index 89f4e2338b44..0f85331bdd5b 100644
--- a/pkgs/misc/emulators/fs-uae/default.nix
+++ b/pkgs/misc/emulators/fs-uae/default.nix
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec{
     license = licenses.gpl2Plus;
     homepage = http://fs-uae.net;
     maintainers = [ maintainers.AndersonTorres ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
 # TODO: testing and Python GUI support
diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix
index a35b7a846b18..a38576dcbe45 100644
--- a/pkgs/misc/emulators/mgba/default.nix
+++ b/pkgs/misc/emulators/mgba/default.nix
@@ -37,5 +37,6 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.mpl20;
     maintainers = with maintainers; [ MP2E AndersonTorres ];
+    platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix
index 1abf621fe7e0..07174d76e4e8 100644
--- a/pkgs/misc/emulators/mupen64plus/default.nix
+++ b/pkgs/misc/emulators/mupen64plus/default.nix
@@ -31,5 +31,6 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2Plus;
     homepage = http://code.google.com/p/mupen64plus;
     maintainers = [ stdenv.lib.maintainers.sander ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/misc/emulators/retroarch/wrapper.nix b/pkgs/misc/emulators/retroarch/wrapper.nix
index e6eb930695a2..58d41699854c 100644
--- a/pkgs/misc/emulators/retroarch/wrapper.nix
+++ b/pkgs/misc/emulators/retroarch/wrapper.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   preferLocalBuild = true;
 
   meta = with retroarch.meta; {
-    inherit license homepage;
+    inherit license homepage platforms maintainers;
     description = description
                   + " (with cores: "
                   + lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) cores))
diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix
index a13cc49b5720..3a537aafa76f 100644
--- a/pkgs/misc/emulators/retrofe/default.nix
+++ b/pkgs/misc/emulators/retrofe/default.nix
@@ -73,5 +73,6 @@ stdenv.mkDerivation rec {
     homepage = http://retrofe.com;
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ hrdinka ];
+    platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix
index e5cd08b7f9de..99de1ae0d177 100644
--- a/pkgs/misc/emulators/snes9x-gtk/default.nix
+++ b/pkgs/misc/emulators/snes9x-gtk/default.nix
@@ -22,9 +22,15 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A portable, freeware Super Nintendo Entertainment System (SNES) emulator";
-    longDescription = "Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES) emulator. It basically allows you to play most games designed for the SNES and Super Famicom Nintendo game systems on your PC or Workstation; which includes some real gems that were only ever released in Japan.";
+    longDescription = ''
+      Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES)
+      emulator. It basically allows you to play most games designed for the SNES
+      and Super Famicom Nintendo game systems on your PC or Workstation; which
+      includes some real gems that were only ever released in Japan.
+    '';
     license = stdenv.lib.licenses.lgpl2;
     maintainers = [ stdenv.lib.maintainers.qknight ];
     homepage = http://www.snes9x.com/;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix
index 9e773b18f7db..ceafc714381c 100644
--- 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;
   };
 }
diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix
index 9c79852a4aa6..82193bc350b6 100644
--- a/pkgs/misc/emulators/vbam/default.nix
+++ b/pkgs/misc/emulators/vbam/default.nix
@@ -55,5 +55,6 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.lassulus ];
     homepage = http://vba-m.com/;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix
index 143c23ee86c4..dd2c2380a8e0 100644
--- a/pkgs/misc/emulators/vice/default.nix
+++ b/pkgs/misc/emulators/vice/default.nix
@@ -40,5 +40,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.viceteam.org;
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.sander ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix
index 2d729f7185fa..357d65aed53f 100644
--- a/pkgs/misc/emulators/wine/winetricks.nix
+++ b/pkgs/misc/emulators/wine/winetricks.nix
@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.lgpl21;
     homepage = http://code.google.com/p/winetricks/;
     maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+    platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix
index be7666487b95..8ad0ca39b07c 100644
--- a/pkgs/misc/emulators/zsnes/default.nix
+++ b/pkgs/misc/emulators/zsnes/default.nix
@@ -70,5 +70,6 @@ in stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.sander ];
     homepage = http://www.zsnes.com;
+    platforms = stdenv.lib.platforms.unix;
   };
 }