diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-07-06 09:30:40 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-07-06 09:30:40 +0000 |
commit | e410c935a1ad2b56940e807c3d48533896372974 (patch) | |
tree | 59950dd29986f74a734da1fdcbb468aa38bf69c6 /pkgs/top-level/all-packages.nix | |
parent | f968ef400fd00a991e8f18003a5a4ccd1707deb8 (diff) | |
download | nixpkgs-e410c935a1ad2b56940e807c3d48533896372974.tar nixpkgs-e410c935a1ad2b56940e807c3d48533896372974.tar.gz nixpkgs-e410c935a1ad2b56940e807c3d48533896372974.tar.bz2 nixpkgs-e410c935a1ad2b56940e807c3d48533896372974.tar.lz nixpkgs-e410c935a1ad2b56940e807c3d48533896372974.tar.xz nixpkgs-e410c935a1ad2b56940e807c3d48533896372974.tar.zst nixpkgs-e410c935a1ad2b56940e807c3d48533896372974.zip |
* Treat i686-darwin as powerpc-darwin.
svn path=/nixpkgs/trunk/; revision=5604
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec1d4dec840..c3d45ab8ede 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 @@ -157,7 +160,7 @@ rec { }; 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 (import ../tools/text/gnused { @@ -759,7 +762,7 @@ rec { }; jdk = - if stdenv.system == "powerpc-darwin" then + if isDarwin stdenv then "/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home" else (import ../development/compilers/jdk) { @@ -959,7 +962,7 @@ rec { php = (import ../development/interpreters/php) { inherit stdenv fetchurl flex bison libxml2 apacheHttpd; unixODBC = - if stdenv.system == "powerpc-darwin" then null else unixODBC; + if isDarwin stdenv then null else unixODBC; }; guile = (import ../development/interpreters/guile) { |