diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index ad8836f40094..ee38a42199ee 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -40,7 +40,7 @@ in defaultText = "pkgs.slurm-llnl"; example = literalExample "pkgs.slurm-llnl-full"; description = '' - The packge to use for slurm binaries. + The package to use for slurm binaries. ''; }; @@ -111,7 +111,7 @@ in builder = pkgs.writeText "builder.sh" '' source $stdenv/setup mkdir -p $out/bin - find ${cfg.package}/bin -type f -executable | while read EXE + find ${getBin cfg.package}/bin -type f -executable | while read EXE do exename="$(basename $EXE)" wrappername="$out/bin/$exename" diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 95d6cd943fa7..5d65e707fd58 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -11,9 +11,11 @@ stdenv.mkDerivation rec { sha256 = "05si1cn7zivggan25brsqfdw0ilvrlnhj96pwv16dh6vfkggzjr1"; }; + outputs = [ "dev" "out" ]; + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig curl python munge perl pam openssl mysql.lib ncurses gtk lua - hwloc numactl + curl python munge perl pam openssl mysql.lib ncurses gtk lua hwloc numactl ]; configureFlags =