pyrox.dev
lol
Merge #137496: dhcp: upstream fix for -fno-common
... into staging
+7
-1
+7
-1
pkgs/tools/networking/dhcp/default.nix
+7
-1
pkgs/tools/networking/dhcp/default.nix
···
1
-
{ stdenv, fetchurl, perl, file, nettools, iputils, iproute2, makeWrapper
1
+
{ stdenv, fetchurl, fetchpatch, perl, file, nettools, iputils, iproute2, makeWrapper
2
2
, coreutils, gnused, openldap ? null
3
3
, buildPackages, lib
4
4
}:
···
18
18
# patch, the hostname doesn't get set properly if the old
19
19
# hostname (i.e. before reboot) is equal to the new hostname.
20
20
./set-hostname.patch
21
+
22
+
(fetchpatch {
23
+
# upstream build fix against -fno-common compilers like >=gcc-10
24
+
url = "https://gitlab.isc.org/isc-projects/dhcp/-/commit/6c7e61578b1b449272dbb40dd8b98d03dad8a57a.patch";
25
+
sha256 = "1g37ix0yf9zza8ri8bg438ygcjviniblfyb20y4gzc8lysy28m8b";
26
+
})
21
27
];
22
28
23
29
nativeBuildInputs = [ perl makeWrapper ];