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

2016-07-25 12:47:13 +00:00
parent 1f04b4a566 e725c927d4
commit f222d98746
261 changed files with 7674 additions and 1000924 deletions
--- a/pkgs/misc/screensavers/xautolock/default.nix
+++ b/pkgs/misc/screensavers/xautolock/default.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
    description = "A program that launches a given program when your X session has been idle for a given time.";
    homepage = http://www.ibiblio.org/pub/linux/X11/screensavers;
    maintainers = with maintainers; [ garbas ];
+    platforms = platforms.unix;
    license = licenses.gpl2;
  };
 }