diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-11-05 09:11:25 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-11-05 09:11:25 +0000 |
| commit | d9f65496d43cb2ba3bc4ab27c40f3f9ae586eb26 (patch) | |
| tree | e18628a23a75f8bf5077a46eeb8b261ed919c8a4 /pkgs/top-level/all-packages.nix | |
| parent | f08bc4c561613ffff7bccd91b0d681ee71c5fd51 (diff) | |
| download | nixpkgs-d9f65496d43cb2ba3bc4ab27c40f3f9ae586eb26.tar nixpkgs-d9f65496d43cb2ba3bc4ab27c40f3f9ae586eb26.tar.gz nixpkgs-d9f65496d43cb2ba3bc4ab27c40f3f9ae586eb26.tar.bz2 nixpkgs-d9f65496d43cb2ba3bc4ab27c40f3f9ae586eb26.tar.lz nixpkgs-d9f65496d43cb2ba3bc4ab27c40f3f9ae586eb26.tar.xz nixpkgs-d9f65496d43cb2ba3bc4ab27c40f3f9ae586eb26.tar.zst nixpkgs-d9f65496d43cb2ba3bc4ab27c40f3f9ae586eb26.zip | |
* "Fix" Perl on Cygwin.
svn path=/nixpkgs/trunk/; revision=18129
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0ed063d397..2990b590f44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2370,12 +2370,14 @@ let impureLibcPath = if stdenv.isLinux then null else "/usr"; }; - perl = import ../development/interpreters/perl-5.10 { + perl510 = import ../development/interpreters/perl-5.10 { inherit stdenv; fetchurl = fetchurlBoot; impureLibcPath = if stdenv.isLinux then null else "/usr"; }; + perl = if system != "i686-cygwin" then perl510 else sysPerl; + # FIXME: unixODBC needs patching on Darwin (see darwinports) phpOld = import ../development/interpreters/php { inherit stdenv fetchurl flex bison libxml2 apacheHttpd; |