From 6f348b83efdf573f69938d5c36b7401d2ea31e01 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 16 Jul 2024 12:46:45 +0300 Subject: [PATCH] openmpi: always use lib.optionals and not lib.optional Less confusing when to use a list and a single argument. --- pkgs/development/libraries/openmpi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index fa238737d4c2..000f63b37c79 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { ucc ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ] - ++ lib.optional (stdenv.isLinux || stdenv.isFreeBSD) rdma-core + ++ lib.optionals (stdenv.isLinux || stdenv.isFreeBSD) [ rdma-core ] ++ lib.optionals fabricSupport [ libpsm2 libfabric @@ -88,8 +88,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals fortranSupport [ gfortran ]; configureFlags = - lib.optional (!cudaSupport) "--disable-mca-dso" - ++ lib.optional (!fortranSupport) "--disable-mpi-fortran" + lib.optionals (!cudaSupport) [ "--disable-mca-dso" ] + ++ lib.optionals (!fortranSupport) [ "--disable-mpi-fortran"] ++ lib.optionals stdenv.isLinux [ "--with-libnl=${lib.getDev libnl}" "--with-pmix=${lib.getDev pmix}"