cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #247628 from NickCao/bpftune

Browse source 
bpftune: unstable-2023-07-14 -> unstable-2023-08-02
This commit is contained in:
Nick Cao 2023-08-08 23:19:22 -06:00 committed by GitHub
commit e74fa540bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/os-specific/linux/bpftune/default.nix
View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bpftune"; pname = "bpftune";
version = "unstable-2023-07-14"; version = "unstable-2023-08-02";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "oracle-samples"; owner = "oracle-samples";
repo = "bpftune"; repo = "bpftune";
rev = "66620152bf8c37ab592e9273fe87e567126801c2"; rev = "f7e051a011d581a3c667b7f7b769862407d85f04";
hash = "sha256-U0O+F1DBF1xiaUKklwpZORBwF1T9wHM0SPQKUNaxKZk="; hash = "sha256-1tfr2vB/XRnpGJVwo2NQkXomz+J6AzvpS1P3rcAyAyI=";
}; };
postPatch = '' postPatch = ''
@ -32,6 +32,9 @@ stdenv.mkDerivation rec {
substituteInPlace include/bpftune/libbpftune.h \ substituteInPlace include/bpftune/libbpftune.h \
--replace /usr/lib64/bpftune/ "$out/lib/bpftune/" \ --replace /usr/lib64/bpftune/ "$out/lib/bpftune/" \
--replace /usr/local/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 = [ nativeBuildInputs = [
@ -50,7 +53,6 @@ stdenv.mkDerivation rec {
"prefix=${placeholder "out"}" "prefix=${placeholder "out"}"
"confprefix=${placeholder "out"}/etc" "confprefix=${placeholder "out"}/etc"
"BPFTUNE_VERSION=${version}" "BPFTUNE_VERSION=${version}"
"BPF_INCLUDE=${lib.getDev libbpf}/include"
"NL_INCLUDE=${lib.getDev libnl}/include/libnl3" "NL_INCLUDE=${lib.getDev libnl}/include/libnl3"
]; ];