diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-08-24 07:31:13 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2022-08-24 07:35:02 +0100 |
| commit | 329b0da5bad4b69affc7d544b9a090bb62ce5359 (patch) | |
| tree | ac5e4dfa8fcefd9c497d74d2b1e745459991a4fe | |
| parent | a1f0d9319976a4a70e25b70fb2fae06a70dd1b7e (diff) | |
| download | nixpkgs-329b0da5bad4b69affc7d544b9a090bb62ce5359.tar nixpkgs-329b0da5bad4b69affc7d544b9a090bb62ce5359.tar.gz nixpkgs-329b0da5bad4b69affc7d544b9a090bb62ce5359.tar.bz2 nixpkgs-329b0da5bad4b69affc7d544b9a090bb62ce5359.tar.lz nixpkgs-329b0da5bad4b69affc7d544b9a090bb62ce5359.tar.xz nixpkgs-329b0da5bad4b69affc7d544b9a090bb62ce5359.tar.zst nixpkgs-329b0da5bad4b69affc7d544b9a090bb62ce5359.zip | |
bpftools: use binutils-2.38 for linux before 5.19
Without the change bpftools build fails on binutils-2.39 due to API change:
jit_disasm.c:105:17: error: too few arguments to function 'init_disassemble_info'
105 | init_disassemble_info(&info, stdout,
| ^~~~~~~~~~~~~~~~~~~~~
| -rw-r--r-- | pkgs/os-specific/linux/bpftools/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/bpftools/default.nix b/pkgs/os-specific/linux/bpftools/default.nix index b4621feeb31..5a02a1022d5 100644 --- a/pkgs/os-specific/linux/bpftools/default.nix +++ b/pkgs/os-specific/linux/bpftools/default.nix @@ -1,15 +1,20 @@ { lib, stdenv -, libopcodes, libbfd, elfutils, readline +, libopcodes, libopcodes_2_38 +, libbfd, libbfd_2_38 +, elfutils, readline , linuxPackages_latest, zlib , python3, bison, flex }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "bpftools"; inherit (linuxPackages_latest.kernel) version src; nativeBuildInputs = [ python3 bison flex ]; - buildInputs = [ libopcodes libbfd elfutils zlib readline ]; + buildInputs = (if (lib.versionAtLeast version "5.20") + then [ libopcodes libbfd ] + else [ libopcodes_2_38 libbfd_2_38 ]) + ++ [ elfutils zlib readline ]; preConfigure = '' patchShebangs scripts/bpf_doc.py |