diff options
| author | Marek Mahut <marek.mahut@gmail.com> | 2019-08-13 21:59:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-13 21:59:37 +0200 |
| commit | 61ea45d6bea9a03a8998f6cb19dc397ead1634cd (patch) | |
| tree | 46942fb30077c768a71c873eef82ce1c923fe626 | |
| parent | 932bb0c3e185a7dbf56be65de76f0e797f53aa97 (diff) | |
| parent | a8e9dc728b4afdb0b8d74b652bee0b563673a1cc (diff) | |
Merge pull request #65403 from dtzWill/update/dhcpcd-8.0.1
dhcpcd: 7.2.3 -> 8.0.2
| -rw-r--r-- | pkgs/tools/networking/dhcpcd/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 6d14789e7f42..f0ae7e014beb 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -3,11 +3,12 @@ stdenv.mkDerivation rec { # when updating this to >=7, check, see previous reverts: # nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix - name = "dhcpcd-7.2.3"; + pname = "dhcpcd"; + version = "8.0.2"; src = fetchurl { - url = "mirror://roy/dhcpcd/${name}.tar.xz"; - sha256 = "0vjnd27y6jm5q2v7fkyxmsn77dcpvpzyzb5bq9lfkas8flbkiavl"; + url = "mirror://roy/${pname}/${pname}-${version}.tar.xz"; + sha256 = "0p3sc9yfb40fn1z8rvvxqd0jpxsxm1967pp6w77x4v2lc7anm8ik"; }; nativeBuildInputs = [ pkgconfig ]; @@ -27,14 +28,14 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ]; - makeFlags = "PREFIX=\${out}"; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; # Hack to make installation succeed. dhcpcd will still use /var/db # at runtime. - installFlags = "DBDIR=\${TMPDIR}/db SYSCONFDIR=$(out)/etc"; + installFlags = [ "DBDIR=$(TMPDIR)/db" "SYSCONFDIR=${placeholder "out"}/etc" ]; # Check that the udev plugin got built. - postInstall = stdenv.lib.optional (udev != null) "[ -e $out/lib/dhcpcd/dev/udev.so ]"; + postInstall = stdenv.lib.optional (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]"; meta = with stdenv.lib; { description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; |