diff options
| -rw-r--r-- | pkgs/development/interpreters/python/2.5/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/2.6/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/text/gnugrep/default.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/python/2.5/default.nix b/pkgs/development/interpreters/python/2.5/default.nix index 592915b41df4a..97a307be1223c 100644 --- a/pkgs/development/interpreters/python/2.5/default.nix +++ b/pkgs/development/interpreters/python/2.5/default.nix @@ -82,4 +82,4 @@ stdenv.mkDerivation ( { # - On Darwin, `python.exe' fails with "Bus Error". platforms = stdenv.lib.platforms.allBut "i686-darwin"; }; -} // (if stdenv.system == "i686-darwin" then { NIX_CFLAGS_COMPILE = "-msse2" ; patches = [./search-path.patch ./nolongdouble.patch]; } else {} ) ) +} // (if stdenv.isDarwin then { NIX_CFLAGS_COMPILE = "-msse2" ; patches = [./search-path.patch ./nolongdouble.patch]; } else {} ) ) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 139d4c429da52..80c09722eec49 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -89,4 +89,4 @@ stdenv.mkDerivation ( { meta = { platforms = stdenv.lib.platforms; }; -} // (if stdenv.system == "i686-darwin" then { NIX_CFLAGS_COMPILE = "-msse2" ; patches = [./search-path.patch]; } else {} ) ) +} // (if stdenv.isDarwin then { NIX_CFLAGS_COMPILE = "-msse2" ; patches = [./search-path.patch]; } else {} ) ) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index d5f0573bad588..61fa64141d614 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -18,4 +18,4 @@ stdenv.mkDerivation (rec { homepage = http://www.openssl.org/; description = "A cryptographic library that implements the SSL and TLS protocols"; }; -} // (if stdenv.system == "i686-darwin" then { patches = [ ./darwin-arch.patch ]; } else {})) +} // (if stdenv.isDarwin then { patches = [ ./darwin-arch.patch ]; } else {})) diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index dc1820c48d3a2..609213aaa6772 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [pcre]; - doCheck = if stdenv.system == "i686-darwin" then false else true; + doCheck = if stdenv.isDarwin then false else true; # On Mac OS X, force use of mkdir -p, since Grep's fallback # (./install-sh) is broken. |