diff options
| author | Anders Kaseorg <andersk@mit.edu> | 2020-01-01 12:24:41 -0800 |
|---|---|---|
| committer | Anders Kaseorg <andersk@mit.edu> | 2020-01-01 15:31:05 -0800 |
| commit | e474db24b1946cc9cbe9eeee5e1a7edb4f252c90 (patch) | |
| tree | ffa5995598459b8625b9aed6c1e266aace79cf7a /pkgs/tools/networking/dhcpcd | |
| parent | a461f3fa9c44b892d798a3c935e7816d26f45f11 (diff) | |
| download | nixpkgs-e474db24b1946cc9cbe9eeee5e1a7edb4f252c90.tar nixpkgs-e474db24b1946cc9cbe9eeee5e1a7edb4f252c90.tar.gz nixpkgs-e474db24b1946cc9cbe9eeee5e1a7edb4f252c90.tar.bz2 nixpkgs-e474db24b1946cc9cbe9eeee5e1a7edb4f252c90.tar.lz nixpkgs-e474db24b1946cc9cbe9eeee5e1a7edb4f252c90.tar.xz nixpkgs-e474db24b1946cc9cbe9eeee5e1a7edb4f252c90.tar.zst nixpkgs-e474db24b1946cc9cbe9eeee5e1a7edb4f252c90.zip | |
dhcpcd: fix RA time unit confusion
Fixes #76710. Submitted upstream as rsmarples/dhcpcd#12. Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Diffstat (limited to 'pkgs/tools/networking/dhcpcd')
| -rw-r--r-- | pkgs/tools/networking/dhcpcd/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
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 = [ |