hwloc: Make it easy to disable optional dependencies; fix cross-builds.
svn path=/nixpkgs/trunk/; revision=31606
This commit is contained in:
parent
3aa99d803e
commit
eb1360bd66
@ -9,7 +9,12 @@ stdenv.mkDerivation rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
# XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo.
|
# 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;
|
doCheck = true;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user