diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/hwloc')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/hwloc/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/hwloc/default.nix b/nixpkgs/pkgs/development/libraries/hwloc/default.nix index 561a4693c1d7..6a939835cf56 100644 --- a/nixpkgs/pkgs/development/libraries/hwloc/default.nix +++ b/nixpkgs/pkgs/development/libraries/hwloc/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, expat, ncurses, pciutils, numactl +{ lib, stdenv, fetchurl, pkg-config, expat, ncurses, pciutils, numactl , x11Support ? false, libX11 ? null, cairo ? null }: assert x11Support -> libX11 != null && cairo != null; -with stdenv.lib; +with lib; let version = "2.4.0"; @@ -25,11 +25,11 @@ in stdenv.mkDerivation { ]; # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo. - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; # Filter out `null' inputs. This allows users to `.override' the # derivation and set optional dependencies to `null'. - buildInputs = stdenv.lib.filter (x: x != null) + buildInputs = lib.filter (x: x != null) ([ expat ncurses ] ++ (optionals x11Support [ cairo libX11 ]) ++ (optionals stdenv.isLinux [ numactl ])); |