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

2016-08-12 09:46:53 +00:00
parent bc025e83bd 532b222296
commit b7787d932e
372 changed files with 7520 additions and 3777 deletions
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
  '';

  meta = {
-    platforms = stdenv.lib.platforms.linux;
+    platforms = [ "x86_64-linux" ];
  };
 }