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/development/libraries/java/swt/default.nix
+++ b/pkgs/development/libraries/java/swt/default.nix
@@ -69,5 +69,6 @@ in stdenv.mkDerivation rec {
    description = "An widget toolkit for Java to access the user-interface facilities of the operating systems on which it is implemented";
    license = licenses.epl10;
    maintainers = with maintainers; [ pSub ];
+    platforms = with platforms; linux;
  };
 }