mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-01 02:23:54 +00:00
40eff710af
Reverts NixOS/nixpkgs#269620 -eab0837b68
caused a mass-rebuild on master - self-merge on a critical package without review and not waiting for the active owner team Below are the reverts of the commits from that PR Revert "systemd: migrate to by-name" This reverts commit33d2a40d67
. Revert "systemd: add meta.longDescription" This reverts commit7c588d141d
. Revert "systemd: cosmetic rewording of code" This reverts commitd91b8d9fcb
. Revert "systemd: cosmetic rewording of comments" This reverts commitbc563998c0
. Revert "systemd: remove some redundancy on mesonFlags" This reverts commiteab0837b68
. Revert "systemd: use lib.meson* functions" This reverts commit1129756b1a
.
23 lines
715 B
Diff
23 lines
715 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Nikolay Amiantov <ab@fmap.me>
|
|
Date: Thu, 25 Jul 2019 20:46:58 +0300
|
|
Subject: [PATCH] systemd-sleep: execute scripts in /etc/systemd/system-sleep
|
|
|
|
This is needed for NixOS to use such scripts as systemd directory is immutable.
|
|
---
|
|
src/sleep/sleep.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
|
|
index de1f6c7ec1..d0cdebd80a 100644
|
|
--- a/src/sleep/sleep.c
|
|
+++ b/src/sleep/sleep.c
|
|
@@ -224,6 +224,7 @@ static int execute(
|
|
};
|
|
static const char* const dirs[] = {
|
|
SYSTEM_SLEEP_PATH,
|
|
+ "/etc/systemd/system-sleep",
|
|
NULL
|
|
};
|
|
|