Unverified Commit 9cd5e3e9 authored by K900's avatar K900 Committed by GitHub
Browse files

xdp-tools: patch to allow building with Emacs 30 (#386619)

parents 73e5401f 862962af

pkgs/tools/networking/xdp-tools/default.nix

+7 −0
Original line number Diff line number Diff line
@@ -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"

pkgs/tools/networking/xdp-tools/emacs-30.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
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"