forked from mirrors/nixpkgs
* On Darwin, use the system Perl instead of building our own for now.
* Build Subversion for Darwin. svn path=/nixpkgs/trunk/; revision=1120
This commit is contained in:
parent
770e57d27c
commit
ec6eb9c473
4 changed files with 18 additions and 1 deletions
4
pkgs/development/interpreters/sys-perl/builder.sh
Normal file
4
pkgs/development/interpreters/sys-perl/builder.sh
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
. $stdenv/setup
|
||||||
|
mkdir $out
|
||||||
|
mkdir $out/bin
|
||||||
|
ln -s /usr/bin/perl $out/bin
|
6
pkgs/development/interpreters/sys-perl/default.nix
Normal file
6
pkgs/development/interpreters/sys-perl/default.nix
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
{stdenv}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
name = "perl";
|
||||||
|
builder = ./builder.sh;
|
||||||
|
}
|
|
@ -288,11 +288,17 @@ rec {
|
||||||
inherit fetchurl stdenv unzip ghc happy;
|
inherit fetchurl stdenv unzip ghc happy;
|
||||||
};
|
};
|
||||||
|
|
||||||
perl = (import ../development/interpreters/perl) {
|
realPerl = (import ../development/interpreters/perl) {
|
||||||
inherit fetchurl stdenv;
|
inherit fetchurl stdenv;
|
||||||
patch = gnupatch;
|
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) {
|
python = (import ../development/interpreters/python) {
|
||||||
inherit fetchurl stdenv zlib;
|
inherit fetchurl stdenv zlib;
|
||||||
};
|
};
|
||||||
|
|
|
@ -60,6 +60,7 @@ let {
|
||||||
|
|
||||||
powerpcDarwinPkgs = {inherit (import ./powerpc-darwin.nix)
|
powerpcDarwinPkgs = {inherit (import ./powerpc-darwin.nix)
|
||||||
aterm
|
aterm
|
||||||
|
subversion
|
||||||
;};
|
;};
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue