From 594f4924de0341292a9aecf39c46c4d545755aba Mon Sep 17 00:00:00 2001 From: Stzx Date: Tue, 26 Aug 2025 16:19:36 +0800 Subject: [PATCH] scx.cscheds: direct use of bash --- pkgs/os-specific/linux/scx/scx_cscheds.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/scx/scx_cscheds.nix b/pkgs/os-specific/linux/scx/scx_cscheds.nix index dc9e138cd7f4..23c183bf8a2a 100644 --- a/pkgs/os-specific/linux/scx/scx_cscheds.nix +++ b/pkgs/os-specific/linux/scx/scx_cscheds.nix @@ -17,15 +17,6 @@ libseccomp, }: -let - # Fixes a bug with the meson build script where it specifies - # /bin/bash twice in the script - misbehaviorBash = writeShellScript "bash" '' - shift 1 - exec ${lib.getExe bash} "$@" - ''; - -in llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "scx_cscheds"; inherit (scx-common) version src; @@ -66,7 +57,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { cp ${finalAttrs.fetchBpftool} meson-scripts/fetch_bpftool cp ${finalAttrs.fetchLibbpf} meson-scripts/fetch_libbpf substituteInPlace meson.build \ - --replace-fail '[build_bpftool' "['${misbehaviorBash}', build_bpftool" + --replace-fail '[build_bpftool' "['${lib.getExe bash}', build_bpftool" # TODO: Remove in next release. substituteInPlace lib/scxtest/overrides.h \