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

2016-03-03 16:11:55 +00:00
parent 4c9c4c4dcd 7a360b13a0
commit fed49425c5
242 changed files with 2052 additions and 2061 deletions
@@ -17,6 +17,12 @@ stdenv.mkDerivation rec {
  '';

  crossAttrs = {
+
+    # disable tests which can't run on build machine
+    postPatch = ''
+      substituteInPlace Makefile.in --replace "tests" " ";
+    '';
+
    preConfigure = ''
      export ac_cv_func_malloc_0_nonnull=yes
      export ac_cv_func_realloc_0_nonnull=yes