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/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -46,4 +46,8 @@ stdenv.mkDerivation rec {
      ln -sv $file $out/lib/klibc/include
    done
  '';
+
+  meta = {
+    platforms = stdenv.lib.platforms.linux;
+  };
 }
--- a/pkgs/os-specific/linux/klibc/shrunk.nix
+++ b/pkgs/os-specific/linux/klibc/shrunk.nix
@@ -21,4 +21,8 @@ stdenv.mkDerivation {
    done
  ''; # */
  allowedReferences = ["out"];
+
+  meta = {
+    platforms = stdenv.lib.platforms.linux;
+  };
 }