systemd: drop 0004-Add-some-NixOS-specific-unit-directories.patch

This patch adds new functionality to systemd, which as per the new patch policy is not allowed. The main use-case this supports (imperatively installing systemd services) is not used as far as I can tell and is not something we want to support. Most services do not run anyways without further adjustments on NixOS.
2026-02-08 16:34:44 +01:00
parent 207fe325e9
commit a9bf6722ae
2 changed files with 0 additions and 130 deletions
@@ -1,129 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Raito Bezarius <masterancpp@gmail.com>
-Date: Mon, 19 Jun 2023 02:13:42 +0200
-Subject: [PATCH] Add some NixOS-specific unit directories
-
-Look in `/nix/var/nix/profiles/default/lib/systemd/{system,user}` for
-units provided by packages installed into the default profile via
-`nix-env -iA nixos.$package`.
-
-Also, remove /usr and /lib as these don't exist on NixOS.
-
-Original-Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
---
- src/core/systemd.pc.in               |  8 ++++----
- src/libsystemd/sd-path/path-lookup.c | 20 +++-----------------
- 2 files changed, 7 insertions(+), 21 deletions(-)
-
-diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
-index 862d57dcb6..8ba0ca4486 100644
--- a/src/core/systemd.pc.in
-+++ b/src/core/systemd.pc.in
-@@ -46,10 +46,10 @@ systemdsystemconfdir=${systemd_system_conf_dir}
- systemd_user_conf_dir=${sysconfdir}/systemd/user
- systemduserconfdir=${systemd_user_conf_dir}
- 
-systemd_system_unit_path=${systemd_system_conf_dir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemd_system_unit_dir}:/usr/lib/systemd/system:/lib/systemd/system
-+systemd_system_unit_path=${systemd_system_conf_dir}:/etc/systemd/system:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/system:${systemd_system_unit_dir}
- systemdsystemunitpath=${systemd_system_unit_path}
- 
-systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemd_user_unit_dir}:/usr/lib/systemd/user:/usr/share/systemd/user
-+systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/user:${systemd_user_unit_dir}
- systemduserunitpath=${systemd_user_unit_path}
- 
- systemd_system_generator_dir=${prefix}/lib/systemd/system-generators
-@@ -58,10 +58,10 @@ systemdsystemgeneratordir=${systemd_system_generator_dir}
- systemd_user_generator_dir=${prefix}/lib/systemd/user-generators
- systemdusergeneratordir=${systemd_user_generator_dir}
- 
-systemd_system_generator_path=/run/systemd/system-generators:/etc/systemd/system-generators:/usr/local/lib/systemd/system-generators:${systemd_system_generator_dir}
-+systemd_system_generator_path=/run/systemd/system-generators:/etc/systemd/system-generators:${systemd_system_generator_dir}
- systemdsystemgeneratorpath=${systemd_system_generator_path}
- 
-systemd_user_generator_path=/run/systemd/user-generators:/etc/systemd/user-generators:/usr/local/lib/systemd/user-generators:${systemd_user_generator_dir}
-+systemd_user_generator_path=/run/systemd/user-generators:/etc/systemd/user-generators:${systemd_user_generator_dir}
- systemdusergeneratorpath=${systemd_user_generator_path}
- 
- systemd_sleep_dir=${prefix}/lib/systemd/system-sleep
-diff --git a/src/libsystemd/sd-path/path-lookup.c b/src/libsystemd/sd-path/path-lookup.c
-index 32c14fb14a..7f0bf62844 100644
--- a/src/libsystemd/sd-path/path-lookup.c
-+++ b/src/libsystemd/sd-path/path-lookup.c
-@@ -102,11 +102,7 @@ int runtime_directory(RuntimeScope scope, const char *fallback_suffix, char **re
- }
- 
- static const char* const user_data_unit_paths[] = {
-        "/usr/local/lib/systemd/user",
-        "/usr/local/share/systemd/user",
-         USER_DATA_UNIT_DIR,
-        "/usr/lib/systemd/user",
-        "/usr/share/systemd/user",
-         NULL
- };
- 
-@@ -519,16 +515,13 @@ int lookup_paths_init(
-                                        persistent_config,
-                                        SYSTEM_CONFIG_UNIT_DIR,
-                                        "/etc/systemd/system",
-+                                       "/nix/var/nix/profiles/default/lib/systemd/system",
-                                        ASSERT_PTR(persistent_attached),
-                                        ASSERT_PTR(runtime_config),
-                                        "/run/systemd/system",
-                                        ASSERT_PTR(runtime_attached),
-                                        STRV_IFNOTNULL(generator),
-                                       "/usr/local/lib/systemd/system",
-                                        SYSTEM_DATA_UNIT_DIR,
-                                       "/usr/lib/systemd/system",
-                                       /* To be used ONLY for images which might be legacy split-usr */
-                                       FLAGS_SET(flags, LOOKUP_PATHS_SPLIT_USR) ? "/lib/systemd/system" : STRV_IGNORE,
-                                        STRV_IFNOTNULL(generator_late));
-                         break;
- 
-@@ -546,13 +539,10 @@ int lookup_paths_init(
-                         add = strv_new(persistent_config,
-                                        USER_CONFIG_UNIT_DIR,
-                                        "/etc/systemd/user",
-+                                       "/nix/var/nix/profiles/default/lib/systemd/user",
-                                        ASSERT_PTR(runtime_config),
-                                        "/run/systemd/user",
-                                       "/usr/local/share/systemd/user",
-                                       "/usr/share/systemd/user",
-                                       "/usr/local/lib/systemd/user",
-                                       USER_DATA_UNIT_DIR,
-                                       "/usr/lib/systemd/user");
-+                                       USER_DATA_UNIT_DIR);
-                         break;
- 
-                 case RUNTIME_SCOPE_USER:
-@@ -692,7 +682,6 @@ void lookup_paths_log(LookupPaths *lp) {
- static const char* const system_generator_paths[] = {
-         "/run/systemd/system-generators",
-         "/etc/systemd/system-generators",
-        "/usr/local/lib/systemd/system-generators",
-         SYSTEM_GENERATOR_DIR,
-         NULL,
- };
-@@ -700,7 +689,6 @@ static const char* const system_generator_paths[] = {
- static const char* const user_generator_paths[] = {
-         "/run/systemd/user-generators",
-         "/etc/systemd/user-generators",
-        "/usr/local/lib/systemd/user-generators",
-         USER_GENERATOR_DIR,
-         NULL,
- };
-@@ -708,7 +696,6 @@ static const char* const user_generator_paths[] = {
- static const char* const system_env_generator_paths[] = {
-         "/run/systemd/system-environment-generators",
-         "/etc/systemd/system-environment-generators",
-        "/usr/local/lib/systemd/system-environment-generators",
-         SYSTEM_ENV_GENERATOR_DIR,
-         NULL,
- };
-@@ -716,7 +703,6 @@ static const char* const system_env_generator_paths[] = {
- static const char* const user_env_generator_paths[] = {
-         "/run/systemd/user-environment-generators",
-         "/etc/systemd/user-environment-generators",
-        "/usr/local/lib/systemd/user-environment-generators",
-         USER_ENV_GENERATOR_DIR,
-         NULL,
- };
@@ -238,7 +238,6 @@ stdenv.mkDerivation (finalAttrs: {
  # patches
  patches = [
    ./0002-Don-t-try-to-unmount-nix-or-nix-store.patch
-    ./0004-Add-some-NixOS-specific-unit-directories.patch
    ./0005-Get-rid-of-a-useless-message-in-user-sessions.patch
    ./0006-hostnamed-localed-timedated-disable-methods-that-cha.patch
    ./0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch