Unverified Commit e74fa540 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #247628 from NickCao/bpftune 

bpftune: unstable-2023-07-14 -> unstable-2023-08-02
parents 6a5cbeab 76e655c9

pkgs/os-specific/linux/bpftune/default.nix

+6 −4
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@ 


stdenv.mkDerivation rec {

  pname = "bpftune";

  version = "unstable-2023-07-14";

  version = "unstable-2023-08-02";



  src = fetchFromGitHub {

    owner = "oracle-samples";

    repo = "bpftune";

    rev = "66620152bf8c37ab592e9273fe87e567126801c2";

    hash = "sha256-U0O+F1DBF1xiaUKklwpZORBwF1T9wHM0SPQKUNaxKZk=";

    rev = "f7e051a011d581a3c667b7f7b769862407d85f04";

    hash = "sha256-1tfr2vB/XRnpGJVwo2NQkXomz+J6AzvpS1P3rcAyAyI=";

  };



  postPatch = ''
@@ -32,6 +32,9 @@ stdenv.mkDerivation rec { 
    substituteInPlace include/bpftune/libbpftune.h \

      --replace /usr/lib64/bpftune/       "$out/lib/bpftune/" \

      --replace /usr/local/lib64/bpftune/ "$out/lib/bpftune/"



    substituteInPlace src/Makefile sample_tuner/Makefile \

      --replace 'BPF_INCLUDE := /usr/include' 'BPF_INCLUDE := ${lib.getDev libbpf}/include' \

  '';



  nativeBuildInputs = [
@@ -50,7 +53,6 @@ stdenv.mkDerivation rec { 
    "prefix=${placeholder "out"}"

    "confprefix=${placeholder "out"}/etc"

    "BPFTUNE_VERSION=${version}"

    "BPF_INCLUDE=${lib.getDev libbpf}/include"

    "NL_INCLUDE=${lib.getDev libnl}/include/libnl3"

  ];