diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-31 13:00:19 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-09-08 18:16:54 +0200 |
| commit | 1e389c976cc5326b08bd166785e643364bb2d8b4 (patch) | |
| tree | 58f51874e758fb2f6412f1d15717a5cfe1a8fb01 /pkgs/development/interpreters/perl | |
| parent | a8fc68a5c02488a2228a1dc4984a3fa6351002eb (diff) | |
| parent | 773595540bd3a52476a7c84799e374d086d1c648 (diff) | |
| download | nixlib-1e389c976cc5326b08bd166785e643364bb2d8b4.tar nixlib-1e389c976cc5326b08bd166785e643364bb2d8b4.tar.gz nixlib-1e389c976cc5326b08bd166785e643364bb2d8b4.tar.bz2 nixlib-1e389c976cc5326b08bd166785e643364bb2d8b4.tar.lz nixlib-1e389c976cc5326b08bd166785e643364bb2d8b4.tar.xz nixlib-1e389c976cc5326b08bd166785e643364bb2d8b4.tar.zst nixlib-1e389c976cc5326b08bd166785e643364bb2d8b4.zip | |
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
Diffstat (limited to 'pkgs/development/interpreters/perl')
| -rw-r--r-- | pkgs/development/interpreters/perl/5.16/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix index 600884db5e67..c1a5374c92ea 100644 --- a/pkgs/development/interpreters/perl/5.16/default.nix +++ b/pkgs/development/interpreters/perl/5.16/default.nix @@ -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)) |