From e474db24b1946cc9cbe9eeee5e1a7edb4f252c90 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Wed, 1 Jan 2020 12:24:41 -0800 Subject: [PATCH] dhcpcd: fix RA time unit confusion Fixes #76710. Submitted upstream as rsmarples/dhcpcd#12. Signed-off-by: Anders Kaseorg --- pkgs/tools/networking/dhcpcd/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 20b017ee67c..c45d017e3f5 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, udev, runtimeShellPackage, runtimeShell }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, udev, runtimeShellPackage, +runtimeShell }: stdenv.mkDerivation rec { # when updating this to >=7, check, see previous reverts: @@ -21,6 +22,13 @@ stdenv.mkDerivation rec { substituteInPlace hooks/dhcpcd-run-hooks.in --replace /bin/sh ${runtimeShell} ''; + patches = [ + (fetchpatch { + url = "https://roy.marples.name/cgit/dhcpcd.git/patch/?id=114870290a8d3d696bc4049c32eef3eed03d6070"; + sha256 = "0kzpwjh2gzvl5lvlnw6lis610p67nassk3apns68ga2pyxlky8qb"; + }) + ]; + preConfigure = "patchShebangs ./configure"; configureFlags = [