diff options
Diffstat (limited to 'pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch index 6acac84a9d2..89804466ad0 100644 --- a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch +++ b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch @@ -1,7 +1,7 @@ -From 90d1a90d3147e9c8db5caec8befabda270e755d4 Mon Sep 17 00:00:00 2001 +From 6871d9637bc653a976e04cd595697d7244a293e2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Fri, 19 Dec 2014 14:46:17 +0100 -Subject: [PATCH 05/19] Add some NixOS-specific unit directories +Subject: [PATCH 05/18] 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 @@ -14,7 +14,7 @@ Also, remove /usr and /lib as these don't exist on NixOS. 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c -index 6fb8c40e7a..142ecdecec 100644 +index 1f4331a8bf..4b9a8ae26e 100644 --- a/src/basic/path-lookup.c +++ b/src/basic/path-lookup.c @@ -92,11 +92,7 @@ int xdg_user_data_dir(char **ret, const char *suffix) { @@ -29,7 +29,7 @@ index 6fb8c40e7a..142ecdecec 100644 NULL }; -@@ -614,15 +610,13 @@ int lookup_paths_init( +@@ -617,15 +613,13 @@ int lookup_paths_init( persistent_config, SYSTEM_CONFIG_UNIT_DIR, "/etc/systemd/system", @@ -46,7 +46,7 @@ index 6fb8c40e7a..142ecdecec 100644 STRV_IFNOTNULL(generator_late)); break; -@@ -638,14 +632,11 @@ int lookup_paths_init( +@@ -641,14 +635,11 @@ int lookup_paths_init( persistent_config, USER_CONFIG_UNIT_DIR, "/etc/systemd/user", @@ -62,23 +62,23 @@ index 6fb8c40e7a..142ecdecec 100644 STRV_IFNOTNULL(generator_late)); break; -@@ -795,7 +786,6 @@ char **generator_binary_paths(UnitFileScope scope) { - case UNIT_FILE_SYSTEM: +@@ -808,7 +799,6 @@ char **generator_binary_paths(LookupScope scope) { + case LOOKUP_SCOPE_SYSTEM: add = strv_new("/run/systemd/system-generators", "/etc/systemd/system-generators", - "/usr/local/lib/systemd/system-generators", SYSTEM_GENERATOR_DIR); break; -@@ -803,7 +793,6 @@ char **generator_binary_paths(UnitFileScope scope) { - case UNIT_FILE_USER: +@@ -816,7 +806,6 @@ char **generator_binary_paths(LookupScope scope) { + case LOOKUP_SCOPE_USER: add = strv_new("/run/systemd/user-generators", "/etc/systemd/user-generators", - "/usr/local/lib/systemd/user-generators", USER_GENERATOR_DIR); break; -@@ -842,12 +831,10 @@ char **env_generator_binary_paths(bool is_system) { +@@ -855,12 +844,10 @@ char **env_generator_binary_paths(bool is_system) { if (is_system) add = strv_new("/run/systemd/system-environment-generators", "/etc/systemd/system-environment-generators", @@ -122,5 +122,5 @@ index fc0f8c34fa..162432e77f 100644 systemd_sleep_dir=${root_prefix}/lib/systemd/system-sleep -- -2.34.0 +2.36.1 |