From 9595bed7c0de1c62195cd6ab583cd054afa54a27 Mon Sep 17 00:00:00 2001 From: Haonan Chen Date: Sat, 3 Jan 2026 16:56:19 +0800 Subject: [PATCH] packages.chn-bsub: use fixed bash --- packages/chn-bsub/default.nix | 4 ++-- packages/chn-bsub/src/main.cpp | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/chn-bsub/default.nix b/packages/chn-bsub/default.nix index db5c07ec..7b6e4f74 100644 --- a/packages/chn-bsub/default.nix +++ b/packages/chn-bsub/default.nix @@ -1,10 +1,10 @@ -{ stdenv, cmake, pkg-config, ftxui, biu, bsubConfig ? null, lib }: stdenv.mkDerivation +{ stdenv, cmake, pkg-config, ftxui, biu, bsubConfig ? null, lib, bash }: stdenv.mkDerivation { name = "chn-bsub"; src = ./.; buildInputs = [ ftxui biu ]; nativeBuildInputs = [ cmake pkg-config ]; postInstall = "ln -s chn-bsub $out/bin/chn_bsub"; - cmakeFlags = lib.optional (bsubConfig != null) [ "-DBSUB_CONFIG=${bsubConfig}" ]; + cmakeFlags = [ "-DBSUB_SH=${bash}/bin/sh" ] ++ lib.optionals (bsubConfig != null) [ "-DBSUB_CONFIG=${bsubConfig}" ]; passthru = { inherit bsubConfig; }; } diff --git a/packages/chn-bsub/src/main.cpp b/packages/chn-bsub/src/main.cpp index 31490dab..9fada2e9 100644 --- a/packages/chn-bsub/src/main.cpp +++ b/packages/chn-bsub/src/main.cpp @@ -8,6 +8,9 @@ # ifndef BSUB_CONFIG # define BSUB_CONFIG "./bsub.yaml" # endif +# ifndef BSUB_SH +# define BSUB_SH "/bin/sh" +# endif using namespace biu::literals; @@ -166,8 +169,8 @@ int main() // 提交任务 log.debug("submit command: {}"_f(State.SubmitCommand)); // -c 对 \\n 的处理与通常情况下不同,我们需要用 -s 然后将命令通过标准输入传入 - biu::exec<{.SearchPath = true, .Stdin = biu::IoType::String}> - ({.Program = "sh", .Args = { "-s"}, .Stdin = State.SubmitCommand}); + biu::exec<{.Stdin = biu::IoType::String}> + ({.Program = BSUB_SH, .Args = { "-s"}, .Stdin = State.SubmitCommand}); break; } else if (!State.UserCommand) return EXIT_FAILURE;