public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Treat i686-darwin as powerpc-darwin.

Browse Source 
svn path=/nixpkgs/trunk/; revision=5604
This commit is contained in:
Eelco Dolstra 2006-07-06 09:30:40 +00:00
parent f968ef400f
commit e410c935a1
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/compression/bzip2/default.nix
View File

@ -3,7 +3,7 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "bzip2-1.0.3"; name = "bzip2-1.0.3";
builder = builder =
if stdenv.system == "powerpc-darwin" then ./builder-darwin.sh if stdenv.system == "powerpc-darwin" || stdenv.system == "i686-darwin" then ./builder-darwin.sh
else if stdenv.system == "i686-freebsd" then ./builder-freebsd.sh else if stdenv.system == "i686-freebsd" then ./builder-freebsd.sh
else if stdenv.system == "i686-cygwin" then ./builder-cygwin.sh else if stdenv.system == "i686-cygwin" then ./builder-cygwin.sh
else ./builder.sh; else ./builder.sh;

9
pkgs/top-level/all-packages.nix
View File

@ -58,6 +58,9 @@ rec {
); );
}; };
# Check if stdenv.system denotes Mac OS X.
isDarwin = stdenv: stdenv.system == "powerpc-darwin" || stdenv.system == "i686-darwin";
### STANDARD ENVIRONMENT ### STANDARD ENVIRONMENT
@ -157,7 +160,7 @@ rec {
}; };
patch = useFromStdenv (stdenv ? patch) stdenv.patch patch = useFromStdenv (stdenv ? patch) stdenv.patch
(if stdenv.system == "powerpc-darwin" then null else gnupatch); (if isDarwin stdenv then null else gnupatch);
gnused = useFromStdenv (stdenv ? gnused) stdenv.gnused gnused = useFromStdenv (stdenv ? gnused) stdenv.gnused
(import ../tools/text/gnused { (import ../tools/text/gnused {
@ -759,7 +762,7 @@ rec {
}; };
jdk = jdk =
if stdenv.system == "powerpc-darwin" then if isDarwin stdenv then
"/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home" "/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home"
else else
(import ../development/compilers/jdk) { (import ../development/compilers/jdk) {
@ -959,7 +962,7 @@ rec {
php = (import ../development/interpreters/php) { php = (import ../development/interpreters/php) {
inherit stdenv fetchurl flex bison libxml2 apacheHttpd; inherit stdenv fetchurl flex bison libxml2 apacheHttpd;
unixODBC = unixODBC =
if stdenv.system == "powerpc-darwin" then null else unixODBC; if isDarwin stdenv then null else unixODBC;
}; };
guile = (import ../development/interpreters/guile) { guile = (import ../development/interpreters/guile) {