public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next-21.05 into staging-21.05

Browse Source
This commit is contained in:
github-actions[bot] 2021-07-29 12:03:06 +00:00 committed by GitHub
commit d228dbd8d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/bpftools/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation {
buildInputs = [ libopcodes libbfd libelf zlib readline ]; buildInputs = [ libopcodes libbfd libelf zlib readline ];
preConfigure = '' preConfigure = ''
patchShebangs scripts/bpf_helpers_doc.py patchShebangs scripts/bpf_doc.py
cd tools/bpf cd tools/bpf
substituteInPlace ./bpftool/Makefile \ substituteInPlace ./bpftool/Makefile \

2
pkgs/os-specific/linux/kernel/perf.nix
View File

@ -55,7 +55,7 @@ stdenv.mkDerivation {
]; ];
postPatch = '' postPatch = ''
patchShebangs scripts/bpf_helpers_doc.py patchShebangs scripts/bpf*_doc.py
''; '';
doCheck = false; # requires "sparse" doCheck = false; # requires "sparse"