diff --git a/pkgs/tools/networking/xdp-tools/default.nix b/pkgs/tools/networking/xdp-tools/default.nix index 78b0b01603de9..7b6a0fd9606ae 100644 --- a/pkgs/tools/networking/xdp-tools/default.nix +++ b/pkgs/tools/networking/xdp-tools/default.nix @@ -25,6 +25,13 @@ stdenv.mkDerivation rec { hash = "sha256-NJawacCrmTuRXsOiAOMD8RaljPnuPFISoWEgiDcInw8="; }; + patches = [ + # Allow building with emacs 30 + # Submitted upstream: https://github.com/xdp-project/xdp-tools/pull/484 + # FIXME: remove when merged + ./emacs-30.patch + ]; + outputs = [ "out" "lib" diff --git a/pkgs/tools/networking/xdp-tools/emacs-30.patch b/pkgs/tools/networking/xdp-tools/emacs-30.patch new file mode 100644 index 0000000000000..f95f301372a9f --- /dev/null +++ b/pkgs/tools/networking/xdp-tools/emacs-30.patch @@ -0,0 +1,13 @@ +diff --git a/configure b/configure +index 271c370..33aabfa 100755 +--- a/configure ++++ b/configure +@@ -97,7 +97,7 @@ check_toolchain() + EMACS="" + else + emacs_version=$($EMACS --version 2>/dev/null | head -n 1) +- if echo $emacs_version | grep -Eq 'GNU Emacs 2[6789]'; then ++ if echo $emacs_version | grep -Eq 'GNU Emacs (2[6789]|30)'; then + echo "using emacs: $emacs_version" + else + echo "not using emacs: $emacs_version"