From 61a7f5f90d93dda7cce27836295288cc0bd9a3f6 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 24 Sep 2021 12:26:27 +0200 Subject: [PATCH] iproute_mptcp: Fix the build My last iproute2 update (247aed05280) broke the build due to the new patch [0]. Reported-by: Sergei Trofimovich [0]: https://github.com/NixOS/nixpkgs/pull/136701#issuecomment-924920542 --- pkgs/os-specific/linux/iproute/mptcp.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/iproute/mptcp.nix b/pkgs/os-specific/linux/iproute/mptcp.nix index 12723213901..8a4cde0c79e 100644 --- a/pkgs/os-specific/linux/iproute/mptcp.nix +++ b/pkgs/os-specific/linux/iproute/mptcp.nix @@ -11,12 +11,13 @@ iproute2.overrideAttrs (oa: rec { sha256 = "07fihvwlaj0ng8s8sxqhd0a9h1narcnp4ibk88km9cpsd32xv4q3"; }; - preConfigure = '' - # Don't try to create /var/lib/arpd: - sed -e '/ARPDDIR/d' -i Makefile + preConfigure = oa.preConfigure + '' patchShebangs configure ''; + # We override "patches" to never apply any iproute2 patches: + patches = [ ]; + meta = with lib; { homepage = "https://github.com/multipath-tcp/iproute-mptcp"; description = "IP-Route extensions for MultiPath TCP";