merge 'staging' into modular-stdenv

In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix were not merged correctly. Conflicts: pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +02:00
parent a8fc68a5c0 773595540b
commit 1e389c976c
1133 changed files with 11926 additions and 2831 deletions
@@ -54,6 +54,12 @@ stdenv.mkDerivation rec {
      ${optionalString stdenv.isArm ''
        configureFlagsArray=(-Dldflags="-lm -lrt")
      ''}
+
+      ${optionalString stdenv.isCygwin ''
+        cp cygwin/cygwin.c{,.bak}
+        echo "#define PERLIO_NOT_STDIO 0" > tmp
+        cat tmp cygwin/cygwin.c.bak > cygwin/cygwin.c
+      ''}
    '';

  preBuild = optionalString (!(stdenv ? gcc && stdenv.gcc.nativeTools))