diff options
| author | Christian Kampka <christian@kampka.net> | 2022-01-10 20:45:19 +0100 |
|---|---|---|
| committer | Christian Kampka <christian@kampka.net> | 2022-01-10 21:50:05 +0100 |
| commit | 93a83a761a253d6c849ef8c70b9802860828b9a4 (patch) | |
| tree | 7ff429f635c24cc4c67b730af76b32bfadf1be48 | |
| parent | 048fd95f106ef4dca58ff01159207a027ab612d9 (diff) | |
| download | nixpkgs-93a83a761a253d6c849ef8c70b9802860828b9a4.tar nixpkgs-93a83a761a253d6c849ef8c70b9802860828b9a4.tar.gz nixpkgs-93a83a761a253d6c849ef8c70b9802860828b9a4.tar.bz2 nixpkgs-93a83a761a253d6c849ef8c70b9802860828b9a4.tar.lz nixpkgs-93a83a761a253d6c849ef8c70b9802860828b9a4.tar.xz nixpkgs-93a83a761a253d6c849ef8c70b9802860828b9a4.tar.zst nixpkgs-93a83a761a253d6c849ef8c70b9802860828b9a4.zip | |
libbpf: Fix musl build
See https://github.com/libbpf/libbpf/pull/41 for details.
| -rw-r--r-- | pkgs/os-specific/linux/libbpf/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index daee83e61db..81e86fe77ef 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -21,12 +21,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-/MLPflnfooe7Wjy8M3CTowAi5oYpscruSkDsaVzhmYQ="; }; + patches = [(fetchpatch { + url = "https://github.com/libbpf/libbpf/pull/41.diff"; + sha256 = "sha256-pg5WARqh6z0nkTHMBhftxwdV2SyswC2lfaCXCpez0VA="; + })]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libelf zlib ]; - sourceRoot = "source/src"; enableParallelBuilding = true; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=$(out)" "-C src" ]; passthru.tests = { bpf = nixosTests.bpf; @@ -34,7 +38,7 @@ stdenv.mkDerivation rec { postInstall = '' # install linux's libbpf-compatible linux/btf.h - install -Dm444 ../include/uapi/linux/btf.h -t $out/include/linux + install -Dm444 include/uapi/linux/btf.h -t $out/include/linux ''; # FIXME: Multi-output requires some fixes to the way the pkg-config file is |