systemd: drop 0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
Instead set this variable via CFLAGS.
This commit is contained in:
-22
@@ -1,22 +0,0 @@
|
||||
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 43aaede5b0..a8e5a75e39 100644
|
||||
--- a/src/sleep/sleep.c
|
||||
+++ b/src/sleep/sleep.c
|
||||
@@ -248,6 +248,7 @@ static int execute(
|
||||
};
|
||||
static const char* const dirs[] = {
|
||||
SYSTEM_SLEEP_PATH,
|
||||
+ "/etc/systemd/system-sleep",
|
||||
NULL
|
||||
};
|
||||
|
||||
@@ -240,7 +240,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./0002-Don-t-try-to-unmount-nix-or-nix-store.patch
|
||||
./0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
|
||||
./0009-add-rootprefix-to-lookup-dir-paths.patch
|
||||
./0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
|
||||
./0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
|
||||
./0013-inherit-systemd-environment-when-calling-generators.patch
|
||||
./0014-core-don-t-taint-on-unmerged-usr.patch
|
||||
@@ -707,7 +706,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postConfigure = ''
|
||||
substituteInPlace config.h \
|
||||
--replace-fail "SYSTEMD_BINARY_PATH" "_SYSTEMD_BINARY_PATH" \
|
||||
--replace-fail "SYSTEM_SHUTDOWN_PATH" "_SYSTEM_SHUTDOWN_PATH"
|
||||
--replace-fail "SYSTEM_SHUTDOWN_PATH" "_SYSTEM_SHUTDOWN_PATH" \
|
||||
--replace-fail "SYSTEM_SLEEP_PATH" "_SYSTEM_SLEEP_PATH"
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
@@ -717,6 +717,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# This path is not exposed via meson
|
||||
"-USYSTEM_SHUTDOWN_PATH"
|
||||
"-DSYSTEM_SHUTDOWN_PATH=\"/etc/systemd/system-shutdown\""
|
||||
|
||||
# This path is not exposed via meson
|
||||
"-USYSTEM_SLEEP_PATH"
|
||||
"-DSYSTEM_SLEEP_PATH=\"/etc/systemd/system-sleep\""
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
Reference in New Issue
Block a user