From bcf010f111faf4f688457e3f39fab1a54af00dd8 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 26 Nov 2009 15:30:56 +0000 Subject: [PATCH] add support for x86_64-darwin svn path=/nixpkgs/trunk/; revision=18650 --- pkgs/stdenv/generic/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 6513c9be7e7b..bea36088c748 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -68,7 +68,7 @@ let (if attrs ? passthru then attrs.passthru else {}); # Utility flags to test the type of platform. - isDarwin = result.system == "i686-darwin" || result.system == "powerpc-darwin"; + isDarwin = result.system == "i686-darwin" || result.system == "powerpc-darwin" || result.system == "x86_64-darwin"; isLinux = result.system == "i686-linux" || result.system == "x86_64-linux" || result.system == "powerpc-linux"; @@ -77,7 +77,8 @@ let || result.system == "i686-freebsd" || result.system == "i686-openbsd" || result.system == "i386-sunos"; - is64bit = result.system == "x86_64-linux"; + is64bit = result.system == "x86_64-linux" + || result.system == "x86_64-darwin"; # Utility function: allow stdenv to be easily regenerated with # a different setup script. (See all-packages.nix for an