From 508e9a0837ed8e839476afa2831358fc03d46eb4 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 27 Oct 2021 21:57:21 +0100 Subject: [PATCH] dhcp: enable parallel building The spedup on my machine is from 62 seconds down to 48 seconds. --- pkgs/tools/networking/dhcp/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 7df04ac0c895..5a531bddcaff 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -24,6 +24,14 @@ stdenv.mkDerivation rec { url = "https://gitlab.isc.org/isc-projects/dhcp/-/commit/6c7e61578b1b449272dbb40dd8b98d03dad8a57a.patch"; sha256 = "1g37ix0yf9zza8ri8bg438ygcjviniblfyb20y4gzc8lysy28m8b"; }) + + # Fix parallel build failure, the patch is pending upstream inclusion: + # https://gitlab.isc.org/isc-projects/dhcp/-/merge_requests/76 + (fetchpatch { + name = "parallel-make.patch"; + url = "https://gitlab.isc.org/isc-projects/dhcp/-/commit/46d101b97c5a3b19a3f63f7b60e5f88994a64e22.patch"; + sha256 = "1y3nsmqjzcg4bhp1xmqp47v7rkl3bpcildkx6mlrg255yvxapmdp"; + }) ]; nativeBuildInputs = [ perl makeWrapper ]; @@ -79,6 +87,8 @@ stdenv.mkDerivation rec { export AR='${stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar' ''; + enableParallelBuilding = true; + meta = with lib; { description = "Dynamic Host Configuration Protocol (DHCP) tools";