From d649398796126aa444e008ea7d07a21d2bcc605e Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Mon, 25 Nov 2024 02:14:37 +0000
Subject: [PATCH] xdp-tools: unpin LLVM-14

> clang: error: unsupported option '-fzero-call-used-regs=used-gpr' for target 'bpf'

required hardeningDisable zerocallusedregs
---
 pkgs/tools/networking/xdp-tools/default.nix | 1 +
 pkgs/top-level/all-packages.nix             | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/xdp-tools/default.nix b/pkgs/tools/networking/xdp-tools/default.nix
index 8cf07fc72385..d1a286117224 100644
--- a/pkgs/tools/networking/xdp-tools/default.nix
+++ b/pkgs/tools/networking/xdp-tools/default.nix
@@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
     wireshark-cli # for tshark
   ];
 
+  hardeningDisable = [ "zerocallusedregs" ];
   # When building BPF, the default CC wrapper is interfering a bit too much.
   BPF_CFLAGS = "-fno-stack-protector -Wno-error=unused-command-line-argument";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 096761ac7410..5149713be458 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5703,9 +5703,7 @@ with pkgs;
     buildGoModule = buildGo123Module;
   };
 
-  xdp-tools = callPackage ../tools/networking/xdp-tools {
-    llvmPackages = llvmPackages_14;
-  };
+  xdp-tools = callPackage ../tools/networking/xdp-tools { };
 
   ugarit = callPackage ../tools/backup/ugarit {
     inherit (chickenPackages_4) eggDerivation fetchegg;