diff options
| author | Will Dietz <w@wdtz.org> | 2018-04-29 16:46:36 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-04-29 16:54:24 -0500 |
| commit | b341529a354774894306f3890437ec9930fcc265 (patch) | |
| tree | 01d75aa5449cfaac68816d62c31f15fe3cc9343b /pkgs/os-specific/linux/systemd | |
| parent | 0a74845ce367bbc57751ae526c8ca7756a27a300 (diff) | |
| download | nixlib-b341529a354774894306f3890437ec9930fcc265.tar nixlib-b341529a354774894306f3890437ec9930fcc265.tar.gz nixlib-b341529a354774894306f3890437ec9930fcc265.tar.bz2 nixlib-b341529a354774894306f3890437ec9930fcc265.tar.lz nixlib-b341529a354774894306f3890437ec9930fcc265.tar.xz nixlib-b341529a354774894306f3890437ec9930fcc265.tar.zst nixlib-b341529a354774894306f3890437ec9930fcc265.zip | |
systemd: use upstream patch to fix building with util-linux 2.32
See linked PR.
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 0bb9f509b38a..ef4b8ec5dfca 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -151,6 +151,14 @@ in stdenv.mkDerivation rec { --replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH" ''; + patches = [ + # https://github.com/systemd/systemd/pull/8580 + (fetchpatch { + url = https://github.com/systemd/systemd/pull/8580.patch; + sha256 = "1yp07hlpgqq0h2y0qc3kasswzkycz6p8d56d695ck1qa2f5bdfgn"; + }) + ]; + hardeningDisable = [ "stackprotector" ]; NIX_CFLAGS_COMPILE = |