Merge branch 'master' into staging

2017-02-27 20:15:27 +01:00
parent 18bd007714 8def08a56c
commit a1919db7cd
832 changed files with 13596 additions and 13197 deletions
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
  configureFlags = [ "--localstatedir=/var/cache" ];

  crossAttrs = {
-    # http://osdir.com/ml/bug-findutils-gnu/2009-08/msg00026.html
-    configureFlags = [ "gl_cv_func_wcwidth_works=yes" ];
+    # Fix the 'buildInputs = [ coreutils ]' above - that adds the cross coreutils to PATH :(
+    propagatedBuildInputs = [ ];
  };

  enableParallelBuilding = true;