mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 06:31:02 +00:00
Code Issues Wiki Activity

Merge pull request #76798 from andersk/dhcpcd-ra-time-units

Browse source 
dhcpcd: fix RA time unit confusion
This commit is contained in:
Florian Klink 2020-01-02 01:56:05 +01:00 committed by GitHub
parent 84c81a4929 e474db24b1
commit fa34e97122
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/tools/networking/dhcpcd/default.nix
View file

@ -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 = [