From ad8974fc539ea952d101ef0b0151270c24fe7201 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 6 Jan 2014 14:12:37 +0100 Subject: [PATCH] Disable test for setuptools on darwin, and add darwin to supported platforms for serf. This should make nodejs working on darwin again --- pkgs/development/libraries/serf/default.nix | 2 +- pkgs/development/python-modules/setuptools/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index 8a7592547c20..e758fe34c362 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation { description = "HTTP client library based on APR"; license = stdenv.lib.licenses.asl20 ; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 952cbe1ff4d6..8ddf0e9329f6 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - doCheck = true; + doCheck = stdenv.system != "x86_64-darwin"; checkPhase = '' ${python}/bin/${python.executable} setup.py test