From 96b408c71bf84ab168a98525db0c7ba22a04f211 Mon Sep 17 00:00:00 2001
From: Haonan Chen <chn@chn.moe>
Date: Sat, 13 Dec 2025 15:54:18 +0800
Subject: [PATCH] nixos/slurm: fix wrapper and refactor

---
 .../services/computing/slurm/slurm.nix        | 44 +++++++++----------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index 4d01d4533f67..822e455ea50b 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -336,31 +336,27 @@ in
 
   config =
     let
-      wrappedSlurm = pkgs.stdenv.mkDerivation {
-        name = "wrappedSlurm";
+      wrappedSlurm = pkgs.runCommand "wrappedSlurm" { } ''
+        mkdir -p $out/bin
+        find  ${lib.getBin cfg.package}/bin -type f -executable | while read EXE
+        do
+          exename="$(basename $EXE)"
+          wrappername="$out/bin/$exename"
+          cat > "$wrappername" <<EOT
+        #!/bin/sh
+        if [ -z "\$SLURM_CONF" ]
+        then
+          SLURM_CONF="${cfg.etcSlurm}/slurm.conf" "$EXE" "\$@"
+        else
+          "$EXE" "\$0"
+        fi
+        EOT
+          chmod +x "$wrappername"
+        done
 
-        builder = pkgs.writeText "builder.sh" ''
-          mkdir -p $out/bin
-          find  ${lib.getBin cfg.package}/bin -type f -executable | while read EXE
-          do
-            exename="$(basename $EXE)"
-            wrappername="$out/bin/$exename"
-            cat > "$wrappername" <<EOT
-          #!/bin/sh
-          if [ -z "$SLURM_CONF" ]
-          then
-            SLURM_CONF="${cfg.etcSlurm}/slurm.conf" "$EXE" "\$@"
-          else
-            "$EXE" "\$0"
-          fi
-          EOT
-            chmod +x "$wrappername"
-          done
-
-          mkdir -p $out/share
-          ln -s ${lib.getBin cfg.package}/share/man $out/share/man
-        '';
-      };
+        mkdir -p $out/share
+        ln -s ${lib.getBin cfg.package}/share/man $out/share/man
+      '';
 
     in
     lib.mkIf (cfg.enableStools || cfg.client.enable || cfg.server.enable || cfg.dbdserver.enable) {