mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-03 12:23:02 +00:00
hwloc: apply nixfmt and remove nested "with lib"
This commit is contained in:
parent
1e00238993
commit
0b253455f3
@ -1,10 +1,18 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, expat, ncurses, pciutils, numactl
|
||||
, x11Support ? false
|
||||
, libX11
|
||||
, cairo
|
||||
, config
|
||||
, enableCuda ? config.cudaSupport
|
||||
, cudaPackages
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
expat,
|
||||
ncurses,
|
||||
pciutils,
|
||||
numactl,
|
||||
x11Support ? false,
|
||||
libX11,
|
||||
cairo,
|
||||
config,
|
||||
enableCuda ? config.cudaSupport,
|
||||
cudaPackages,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -22,11 +30,17 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
# XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo.
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ];
|
||||
nativeBuildInputs = [ pkg-config ] ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ];
|
||||
|
||||
buildInputs = [ expat ncurses ]
|
||||
++ lib.optionals x11Support [ cairo libX11 ]
|
||||
buildInputs =
|
||||
[
|
||||
expat
|
||||
ncurses
|
||||
]
|
||||
++ lib.optionals x11Support [
|
||||
cairo
|
||||
libX11
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ numactl ]
|
||||
++ lib.optionals enableCuda [ cudaPackages.cuda_cudart ];
|
||||
|
||||
@ -51,9 +65,15 @@ stdenv.mkDerivation rec {
|
||||
# fail on some build machines.
|
||||
doCheck = false;
|
||||
|
||||
outputs = [ "out" "lib" "dev" "doc" "man" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"lib"
|
||||
"dev"
|
||||
"doc"
|
||||
"man"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Portable abstraction of hierarchical architectures for high-performance computing";
|
||||
longDescription = ''
|
||||
hwloc provides a portable abstraction (across OS,
|
||||
@ -71,9 +91,12 @@ stdenv.mkDerivation rec {
|
||||
more.
|
||||
'';
|
||||
# https://www.open-mpi.org/projects/hwloc/license.php
|
||||
license = licenses.bsd3;
|
||||
license = lib.licenses.bsd3;
|
||||
homepage = "https://www.open-mpi.org/projects/hwloc/";
|
||||
maintainers = with maintainers; [ fpletz markuskowa ];
|
||||
platforms = platforms.all;
|
||||
maintainers = with lib.maintainers; [
|
||||
fpletz
|
||||
markuskowa
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user