From b9b3f64b869e0836c28006e07dfaedf679d0dcaf Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Thu, 11 Sep 2025 23:37:09 +0530 Subject: [PATCH] scx.cscheds: patch build_bpftool meson script explicitly Turns out ./patchShebangs wasn't doing its job properly. This was verified after running `patchShebangs ./meson-scripts` and then `cat ./meson-scripts/build_bpftool` (cherry picked from commit 0b14bcb36298f3f5a700843dede751a695ba122f) --- pkgs/os-specific/linux/scx/scx_cscheds.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/scx/scx_cscheds.nix b/pkgs/os-specific/linux/scx/scx_cscheds.nix index 8497ddac1d15..a487493bad5b 100644 --- a/pkgs/os-specific/linux/scx/scx_cscheds.nix +++ b/pkgs/os-specific/linux/scx/scx_cscheds.nix @@ -56,8 +56,8 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { patchShebangs ./meson-scripts cp ${finalAttrs.fetchBpftool} meson-scripts/fetch_bpftool cp ${finalAttrs.fetchLibbpf} meson-scripts/fetch_libbpf - substituteInPlace meson.build \ - --replace-fail '[build_bpftool' "['${lib.getExe bash}', build_bpftool" + substituteInPlace ./meson-scripts/build_bpftool \ + --replace-fail '/bin/bash' '${lib.getExe bash}' ''; nativeBuildInputs = [