Merge remote-tracking branch 'upstream/master' into HEAD

2017-05-22 09:21:40 +02:00
parent b175feb8e1 64a924a96b
commit 99cfab07b9
188 changed files with 22491 additions and 54822 deletions
@@ -92,7 +92,7 @@ let

  pkgs = pkgsFun ({inherit system;} // selectedCrossSystem);

-  glibc = pkgs.buildPackages.libcCross;
+  glibc = pkgs.libcCross;
  bash = pkgs.bash;
  findutils = pkgs.findutils;
  diffutils = pkgs.diffutils;