Merge #2823: better cygwin support, also add x86_64

Conflicts (easy): pkgs/development/interpreters/perl/5.16/default.nix
2014-08-14 20:38:09 +02:00
parent 59291fdbf4 86e18c965f
commit d1ed0f44cd
4 changed files with 16 additions and 3 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))
@@ -64,5 +70,6 @@ stdenv.mkDerivation rec {

  setupHook = ./setup-hook.sh;

+  doCheck = stdenv.isLinux;
  passthru.libPrefix = "lib/perl5/site_perl";
 }