diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-05-29 16:37:31 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-05-29 16:37:31 +0000 |
| commit | 606913fc8fa9221692294c7aca7d0c7318ee4099 (patch) | |
| tree | e2c383b7b92f231aa351eeb006293f7e529071aa /pkgs/development | |
| parent | 472a9d6e3dcdc0e5f99ccba4d7144a0d960c6e8d (diff) | |
| download | nixlib-606913fc8fa9221692294c7aca7d0c7318ee4099.tar nixlib-606913fc8fa9221692294c7aca7d0c7318ee4099.tar.gz nixlib-606913fc8fa9221692294c7aca7d0c7318ee4099.tar.bz2 nixlib-606913fc8fa9221692294c7aca7d0c7318ee4099.tar.lz nixlib-606913fc8fa9221692294c7aca7d0c7318ee4099.tar.xz nixlib-606913fc8fa9221692294c7aca7d0c7318ee4099.tar.zst nixlib-606913fc8fa9221692294c7aca7d0c7318ee4099.zip | |
hwloc: Disable dependency on Cairo and X11 on Cygwin.
svn path=/nixpkgs/trunk/; revision=34278
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/hwloc/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 502e8b94bbd9..48ee3cebe7e8 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; |