diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-01-17 16:34:10 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-01-17 16:34:10 +0000 |
| commit | eb1360bd663b1c9d2cbf7f2a124c8c2c359e49ce (patch) | |
| tree | a083a23a45dd0855157f535b189ea708ae404720 /pkgs/development/libraries/hwloc | |
| parent | 3aa99d803ee66dda1f515d24b008c38317ede0ed (diff) | |
| download | nixpkgs-eb1360bd663b1c9d2cbf7f2a124c8c2c359e49ce.tar nixpkgs-eb1360bd663b1c9d2cbf7f2a124c8c2c359e49ce.tar.gz nixpkgs-eb1360bd663b1c9d2cbf7f2a124c8c2c359e49ce.tar.bz2 nixpkgs-eb1360bd663b1c9d2cbf7f2a124c8c2c359e49ce.tar.lz nixpkgs-eb1360bd663b1c9d2cbf7f2a124c8c2c359e49ce.tar.xz nixpkgs-eb1360bd663b1c9d2cbf7f2a124c8c2c359e49ce.tar.zst nixpkgs-eb1360bd663b1c9d2cbf7f2a124c8c2c359e49ce.zip | |
hwloc: Make it easy to disable optional dependencies; fix cross-builds.
svn path=/nixpkgs/trunk/; revision=31606
Diffstat (limited to 'pkgs/development/libraries/hwloc')
| -rw-r--r-- | pkgs/development/libraries/hwloc/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 303f2750d82..09de2e702e1 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -9,7 +9,12 @@ stdenv.mkDerivation rec { }; # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo. - buildInputs = [ pkgconfig cairo expat ncurses libX11 ]; + buildNativeInputs = [ pkgconfig ]; + + # 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 ]; doCheck = true; |