pyrox.dev / nixpkgs
lol
fork atom

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

authored by K900 and committed by GitHub 9cd5e3e9 73e5401f

+20
unified split
+7
pkgs/tools/networking/xdp-tools/default.nix
··· 25 hash = "sha256-NJawacCrmTuRXsOiAOMD8RaljPnuPFISoWEgiDcInw8="; 26 }; 27 28 outputs = [ 29 "out" 30 "lib"
··· 25 hash = "sha256-NJawacCrmTuRXsOiAOMD8RaljPnuPFISoWEgiDcInw8="; 26 }; 27 28 + patches = [ 29 + # Allow building with emacs 30 30 + # Submitted upstream: https://github.com/xdp-project/xdp-tools/pull/484 31 + # FIXME: remove when merged 32 + ./emacs-30.patch 33 + ]; 34 + 35 outputs = [ 36 "out" 37 "lib"
+13
pkgs/tools/networking/xdp-tools/emacs-30.patch
···
··· 1 + diff --git a/configure b/configure 2 + index 271c370..33aabfa 100755 3 + --- a/configure 4 + +++ b/configure 5 + @@ -97,7 +97,7 @@ check_toolchain() 6 + EMACS="" 7 + else 8 + emacs_version=$($EMACS --version 2>/dev/null | head -n 1) 9 + - if echo $emacs_version | grep -Eq 'GNU Emacs 2[6789]'; then 10 + + if echo $emacs_version | grep -Eq 'GNU Emacs (2[6789]|30)'; then 11 + echo "using emacs: $emacs_version" 12 + else 13 + echo "not using emacs: $emacs_version"