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

2016-04-07 21:52:26 +00:00
parent a73a28de7b 25cc1c12fe
commit 3e68106afd
198 changed files with 32102 additions and 27617 deletions
@@ -22,4 +22,6 @@ in stdenv.mkDerivation {

  # Headers shouldn't reference anything else
  allowedReferences = [];
+
+  meta.platforms = stdenv.lib.platforms.linux;
 }