diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2021-09-24 12:26:27 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2021-09-24 12:28:51 +0200 |
| commit | 61a7f5f90d93dda7cce27836295288cc0bd9a3f6 (patch) | |
| tree | 12e0c274d021d607d5d73d59d9da84c0e63a932c /pkgs/os-specific/linux/iproute | |
| parent | 213597c007e28fbf2f59eea21758540c80d0e360 (diff) | |
| download | nixpkgs-61a7f5f90d93dda7cce27836295288cc0bd9a3f6.tar nixpkgs-61a7f5f90d93dda7cce27836295288cc0bd9a3f6.tar.gz nixpkgs-61a7f5f90d93dda7cce27836295288cc0bd9a3f6.tar.bz2 nixpkgs-61a7f5f90d93dda7cce27836295288cc0bd9a3f6.tar.lz nixpkgs-61a7f5f90d93dda7cce27836295288cc0bd9a3f6.tar.xz nixpkgs-61a7f5f90d93dda7cce27836295288cc0bd9a3f6.tar.zst nixpkgs-61a7f5f90d93dda7cce27836295288cc0bd9a3f6.zip | |
iproute_mptcp: Fix the build
My last iproute2 update (247aed05280) broke the build due to the new patch [0]. Reported-by: Sergei Trofimovich <slyich@gmail.com> [0]: https://github.com/NixOS/nixpkgs/pull/136701#issuecomment-924920542
Diffstat (limited to 'pkgs/os-specific/linux/iproute')
| -rw-r--r-- | pkgs/os-specific/linux/iproute/mptcp.nix | 7 |
1 files 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"; |