diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-07-01 16:57:31 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-07-01 16:57:31 +0000 |
commit | ec6eb9c473c5c56654ad47f3949c9fe0ed465d79 (patch) | |
tree | d5bb9e89ff8c79edc944a6b569d98521816b35e7 /pkgs/system/all-packages-generic.nix | |
parent | 770e57d27cbcac8fc28aaf0e58498e5569e849f3 (diff) | |
download | nixpkgs-ec6eb9c473c5c56654ad47f3949c9fe0ed465d79.tar nixpkgs-ec6eb9c473c5c56654ad47f3949c9fe0ed465d79.tar.gz nixpkgs-ec6eb9c473c5c56654ad47f3949c9fe0ed465d79.tar.bz2 nixpkgs-ec6eb9c473c5c56654ad47f3949c9fe0ed465d79.tar.lz nixpkgs-ec6eb9c473c5c56654ad47f3949c9fe0ed465d79.tar.xz nixpkgs-ec6eb9c473c5c56654ad47f3949c9fe0ed465d79.tar.zst nixpkgs-ec6eb9c473c5c56654ad47f3949c9fe0ed465d79.zip |
* On Darwin, use the system Perl instead of building our own for now.
* Build Subversion for Darwin. svn path=/nixpkgs/trunk/; revision=1120
Diffstat (limited to 'pkgs/system/all-packages-generic.nix')
-rw-r--r-- | pkgs/system/all-packages-generic.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index db2959611b3..add49a49879 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -288,11 +288,17 @@ rec { inherit fetchurl stdenv unzip ghc happy; }; - perl = (import ../development/interpreters/perl) { + realPerl = (import ../development/interpreters/perl) { inherit fetchurl stdenv; patch = gnupatch; }; + sysPerl = (import ../development/interpreters/sys-perl) { + inherit stdenv; + }; + + perl = if stdenv.system == "powerpc-darwin7.3.0" then sysPerl else realPerl; + python = (import ../development/interpreters/python) { inherit fetchurl stdenv zlib; }; |