From 606913fc8fa9221692294c7aca7d0c7318ee4099 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 29 May 2012 16:37:31 +0000 Subject: [PATCH] hwloc: Disable dependency on Cairo and X11 on Cygwin. svn path=/nixpkgs/trunk/; revision=34278 --- pkgs/development/libraries/hwloc/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 502e8b94bbd..48ee3cebe7e 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { # Filter out `null' inputs. This allows users to `.override' the # derivation and set optional dependencies to `null'. buildInputs = stdenv.lib.filter (x: x != null) - [ cairo expat ncurses libX11 ]; + ([ expat ncurses ] + ++ (stdenv.lib.optionals (!stdenv.isCygwin) [ cairo libX11 ])); doCheck = true;