Merge pull request #258214 from markuskowa/split-rdma-core
rdma-core: split outputs -> out, man, dev
This commit is contained in:
commit
1af7a07ae9
|
@ -43,11 +43,11 @@ stdenv.mkDerivation rec {
|
||||||
++ lib.optionals enableRocm [ rocm-core rocm-runtime rocm-device-libs hip ];
|
++ lib.optionals enableRocm [ rocm-core rocm-runtime rocm-device-libs hip ];
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-rdmacm=${rdma-core}"
|
"--with-rdmacm=${lib.getDev rdma-core}"
|
||||||
"--with-dc"
|
"--with-dc"
|
||||||
"--with-rc"
|
"--with-rc"
|
||||||
"--with-dm"
|
"--with-dm"
|
||||||
"--with-verbs=${rdma-core}"
|
"--with-verbs=${lib.getDev rdma-core}"
|
||||||
] ++ lib.optional enableCuda "--with-cuda=${cudatoolkit'}"
|
] ++ lib.optional enableCuda "--with-cuda=${cudatoolkit'}"
|
||||||
++ lib.optional enableRocm "--with-rocm=${rocm}";
|
++ lib.optional enableRocm "--with-rocm=${rocm}";
|
||||||
|
|
||||||
|
|
|
@ -26,6 +26,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
||||||
|
outputs = [ "out" "man" "dev" ];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
docutils
|
docutils
|
||||||
|
|
|
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
|
||||||
"--with-lz4=${lz4.dev}"
|
"--with-lz4=${lz4.dev}"
|
||||||
"--with-munge=${munge}"
|
"--with-munge=${munge}"
|
||||||
"--with-yaml=${libyaml.dev}"
|
"--with-yaml=${libyaml.dev}"
|
||||||
"--with-ofed=${rdma-core}"
|
"--with-ofed=${lib.getDev rdma-core}"
|
||||||
"--sysconfdir=/etc/slurm"
|
"--sysconfdir=/etc/slurm"
|
||||||
"--with-pmix=${pmix}"
|
"--with-pmix=${pmix}"
|
||||||
"--with-bpf=${libbpf}"
|
"--with-bpf=${libbpf}"
|
||||||
|
|
Loading…
Reference in a new issue