Commit 594f4924 authored by Stzx's avatar Stzx Committed by Masum Reza
Browse files

scx.cscheds: direct use of bash

parent 3c735c57

pkgs/os-specific/linux/scx/scx_cscheds.nix

+1 −10
Original line number Diff line number Diff line
@@ -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 \