diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-07-28 13:44:21 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-07-28 17:46:39 +0000 |
commit | cab13e087c80c4e7476bb7df432e2b7deb56563d (patch) | |
tree | f8c7f771072bc7c5453625dfdb80cbd3d2c30fb4 /pkgs/os-specific/linux/iproute/mptcp.nix | |
parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
parent | 8ecc61c91a596df7d3293603a9c2384190c1b89a (diff) | |
download | nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.gz nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.bz2 nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.lz nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.xz nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.zst nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable' into nixpkgs-update
Conflicts: pkgs/applications/graphics/hello-wayland/default.nix pkgs/applications/virtualization/cloud-hypervisor/default.nix pkgs/applications/window-managers/tinywl/default.nix pkgs/applications/window-managers/wayfire/applications.nix pkgs/applications/window-managers/wayfire/default.nix pkgs/applications/window-managers/wayfire/wcm.nix pkgs/applications/window-managers/wayfire/wf-config.nix pkgs/applications/window-managers/wayfire/wf-shell.nix pkgs/development/libraries/wlroots/default.nix pkgs/os-specific/linux/chromium-os/crosvm/default.nix pkgs/os-specific/linux/kernel/common-config.nix pkgs/os-specific/linux/kernel/patches.nix pkgs/os-specific/linux/mdevd/default.nix pkgs/os-specific/linux/s6-linux-init/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/os-specific/linux/iproute/mptcp.nix')
-rw-r--r-- | pkgs/os-specific/linux/iproute/mptcp.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/iproute/mptcp.nix b/pkgs/os-specific/linux/iproute/mptcp.nix index 4a58ae9e046..12723213901 100644 --- a/pkgs/os-specific/linux/iproute/mptcp.nix +++ b/pkgs/os-specific/linux/iproute/mptcp.nix @@ -1,6 +1,6 @@ -{ stdenv, iproute, fetchFromGitHub }: +{ lib, iproute2, fetchFromGitHub }: -iproute.overrideAttrs (oa: rec { +iproute2.overrideAttrs (oa: rec { pname = "iproute_mptcp"; version = "0.95"; @@ -11,7 +11,13 @@ iproute.overrideAttrs (oa: rec { sha256 = "07fihvwlaj0ng8s8sxqhd0a9h1narcnp4ibk88km9cpsd32xv4q3"; }; - meta = with stdenv.lib; { + preConfigure = '' + # Don't try to create /var/lib/arpd: + sed -e '/ARPDDIR/d' -i Makefile + patchShebangs configure + ''; + + meta = with lib; { homepage = "https://github.com/multipath-tcp/iproute-mptcp"; description = "IP-Route extensions for MultiPath TCP"; license = licenses.gpl2; |