From 87b4b84885e37c46b7fea4c15fd6c8e8808b995c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Tue, 28 Jan 2025 09:05:05 +0100 Subject: [PATCH] slurm: make nvml configurable --- pkgs/by-name/sl/slurm/package.nix | 16 ++++++++++++++-- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sl/slurm/package.nix b/pkgs/by-name/sl/slurm/package.nix index 97b3a45c535c..60ccaecca0cc 100644 --- a/pkgs/by-name/sl/slurm/package.nix +++ b/pkgs/by-name/sl/slurm/package.nix @@ -2,6 +2,8 @@ lib, stdenv, fetchFromGitHub, + runCommand, + config, pkg-config, libtool, curl, @@ -33,6 +35,8 @@ enableX11 ? true, enableGtk2 ? false, gtk2, + enableNVML ? config.cudaSupport, + nvml, }: stdenv.mkDerivation rec { @@ -113,7 +117,14 @@ stdenv.mkDerivation rec { http-parser ] ++ lib.optionals enableX11 [ xorg.xauth ] - ++ lib.optionals enableGtk2 [ gtk2 ]; + ++ lib.optionals enableGtk2 [ gtk2 ] + ++ lib.optionals enableNVML [ + (runCommand "collect-nvml" { } '' + mkdir $out + ln -s ${nvml.dev}/include $out/include + ln -s ${nvml.lib}/lib/stubs $out/lib + '') + ]; configureFlags = [ @@ -132,7 +143,8 @@ stdenv.mkDerivation rec { "--without-rpath" # Required for configure to pick up the right dlopen path ] ++ (lib.optional enableGtk2 "--disable-gtktest") - ++ (lib.optional (!enableX11) "--disable-x11"); + ++ (lib.optional (!enableX11) "--disable-x11") + ++ (lib.optional (enableNVML) "--with-nvml"); preConfigure = '' patchShebangs ./doc/html/shtml2html.py diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24ca4786cd2b..41dfd075abe7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8285,6 +8285,10 @@ with pkgs; sloc = nodePackages.sloc; + slurm = callPackage ../by-name/sl/slurm/package.nix { + nvml = cudaPackages.cuda_nvml_dev; + }; + snowman = qt5.callPackage ../development/tools/analysis/snowman { }; sparse = callPackage ../development/tools/analysis/sparse {