diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-09-24 12:01:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-24 12:01:40 +0000 |
| commit | c12d591720498da31c4efe8c94cdf5649593f2f9 (patch) | |
| tree | 47723bc58384e4c59976f780b73bd4beb599dc7d /pkgs/os-specific/linux/iproute/mptcp.nix | |
| parent | 241c3e0b3f193e8696038aa650e364aafcfd06c6 (diff) | |
| parent | 3c5feb0170e007ad5a4b34fc96e2ee06caea56f4 (diff) | |
| download | nixpkgs-c12d591720498da31c4efe8c94cdf5649593f2f9.tar nixpkgs-c12d591720498da31c4efe8c94cdf5649593f2f9.tar.gz nixpkgs-c12d591720498da31c4efe8c94cdf5649593f2f9.tar.bz2 nixpkgs-c12d591720498da31c4efe8c94cdf5649593f2f9.tar.lz nixpkgs-c12d591720498da31c4efe8c94cdf5649593f2f9.tar.xz nixpkgs-c12d591720498da31c4efe8c94cdf5649593f2f9.tar.zst nixpkgs-c12d591720498da31c4efe8c94cdf5649593f2f9.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific/linux/iproute/mptcp.nix')
| -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"; |