diff options
author | Erik Arvstedt <erik.arvstedt@gmail.com> | 2023-06-20 20:39:52 +0200 |
---|---|---|
committer | Erik Arvstedt <erik.arvstedt@gmail.com> | 2023-06-20 20:43:14 +0200 |
commit | 002b6f84a6ccdce80e013d3d8e0f27926ae574af (patch) | |
tree | 2cfe928cb4db39e0854f9a435fa3b9da9641bd24 /pkgs | |
parent | 8b9041779d570adb5de8b3fae57c0dfcdb1fd920 (diff) | |
download | nixpkgs-002b6f84a6ccdce80e013d3d8e0f27926ae574af.tar nixpkgs-002b6f84a6ccdce80e013d3d8e0f27926ae574af.tar.gz nixpkgs-002b6f84a6ccdce80e013d3d8e0f27926ae574af.tar.bz2 nixpkgs-002b6f84a6ccdce80e013d3d8e0f27926ae574af.tar.lz nixpkgs-002b6f84a6ccdce80e013d3d8e0f27926ae574af.tar.xz nixpkgs-002b6f84a6ccdce80e013d3d8e0f27926ae574af.tar.zst nixpkgs-002b6f84a6ccdce80e013d3d8e0f27926ae574af.zip |
systemd: fix services not stopping
Fixes #237591
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index fd5ca2df5a9..ab64c9f9c48 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -190,6 +190,13 @@ stdenv.mkDerivation (finalAttrs: { ./0017-core-don-t-taint-on-unmerged-usr.patch ./0018-tpm2_context_init-fix-driver-name-checking.patch ./0019-bootctl-also-print-efi-files-not-owned-by-systemd-in.patch + + # https://github.com/systemd/systemd/pull/28000 + (fetchpatch { + name = "fix-service-exit"; + url = "https://github.com/systemd/systemd/commit/5f7f82ba625ee48d662c1f0286f44b8b0918d05d.patch"; + sha256 = "sha256-pFRXpZjeVl5ZG/mOjHEuMg9zXq4Orwvdp+/LYTbR09I="; + }) ] ++ lib.optional stdenv.hostPlatform.isMusl ( let oe-core = fetchzip { |