Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5b74cd218690
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6f7c3fbff756
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 30, 2020

  1. bpftool: fix compilation with 5.5

    @Mic92
    Mic92 committed Jan 30, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    pierreis Pierre
    GPG key ID: F88C917469AB1D8C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6f7c3fb View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 pkgs/os-specific/linux/bpftool/default.nix
4 changes: 4 additions & 0 deletions pkgs/os-specific/linux/bpftool/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
{ stdenv
, libopcodes, libbfd, libelf
, linuxPackages_latest, zlib
, python3
}:

stdenv.mkDerivation {
pname = "bpftool";
inherit (linuxPackages_latest.kernel) version src;

nativeBuildInputs = [ python3 ];
buildInputs = [ libopcodes libbfd libelf zlib ];

preConfigure = ''
patchShebangs scripts/bpf_helpers_doc.py
cd tools/bpf/bpftool
substituteInPlace ./Makefile \
--replace '/usr/local' "$out" \