nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-04 22:10:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

systemd: 258.3 -> 259

Browse Source 
Had to revert https://github.com/NixOS/nixpkgs/pull/404902 as it gives
linker errors. And I don't think the systemd tests work on NixOS anyway.
This commit is contained in:
Arian van Putten
2025-12-29 19:05:01 +01:00
committed by Arian van Putten
parent c5829b03be
commit 1ff4f6ef8a
19 changed files with 68 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
View File

@@ -14,10 +14,10 @@ Original-Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
index 57ab68deb6..8e281b8f2c 100644
index 25e229bf3e..b9af1c3b13 100644
--- a/src/shared/fstab-util.c
+++ b/src/shared/fstab-util.c
@@ -72,6 +72,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) {
@@ -76,6 +76,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) {
/* Don't bother with the OS data itself */
if (PATH_IN_SET(mount,
"/",
@@ -27,7 +27,7 @@ index 57ab68deb6..8e281b8f2c 100644
"/etc"))
return true;
diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
index 45c6db9245..d7283b7fa6 100644
index 46f208824a..3a625ad2a6 100644
--- a/src/shutdown/umount.c
+++ b/src/shutdown/umount.c
@@ -178,8 +178,10 @@ int mount_points_list_get(FILE *f, MountPoint **head) {

6
pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
View File

@@ -10,10 +10,10 @@ container, so checking early whether it exists will fail.
1 file changed, 2 insertions(+)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index ab8746c442..480a9c55c6 100644
index e4fccaa3a7..05e6be8874 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -6165,6 +6165,7 @@ static int run(int argc, char *argv[]) {
@@ -6208,6 +6208,7 @@ static int run(int argc, char *argv[]) {
goto finish;
}
} else {
@@ -21,7 +21,7 @@ index ab8746c442..480a9c55c6 100644
_cleanup_free_ char *p = NULL;
if (arg_pivot_root_new)
@@ -6184,6 +6185,7 @@ static int run(int argc, char *argv[]) {
@@ -6227,6 +6228,7 @@ static int run(int argc, char *argv[]) {
log_error_errno(r, "Unable to determine if %s looks like it has an OS tree (i.e. whether /usr/ exists): %m", arg_directory);
goto finish;
}

18
pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch
View File

@@ -16,7 +16,7 @@ Original-Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
2 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
index 58f2463104..0c263430a7 100644
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}
@@ -46,10 +46,10 @@ index 58f2463104..0c263430a7 100644
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 3ddbda0e9f..3eddc80c90 100644
index 389d7e2ad9..0819689ffa 100644
--- a/src/libsystemd/sd-path/path-lookup.c
+++ b/src/libsystemd/sd-path/path-lookup.c
@@ -64,11 +64,7 @@ int runtime_directory(RuntimeScope scope, const char *suffix, char **ret) {
@@ -86,11 +86,7 @@ int runtime_directory(RuntimeScope scope, const char *fallback_suffix, char **re
}
static const char* const user_data_unit_paths[] = {
@@ -61,7 +61,7 @@ index 3ddbda0e9f..3eddc80c90 100644
NULL
};
@@ -476,16 +472,13 @@ int lookup_paths_init(
@@ -498,16 +494,13 @@ int lookup_paths_init(
persistent_config,
SYSTEM_CONFIG_UNIT_DIR,
"/etc/systemd/system",
@@ -79,7 +79,7 @@ index 3ddbda0e9f..3eddc80c90 100644
STRV_IFNOTNULL(generator_late));
break;
@@ -503,13 +496,10 @@ int lookup_paths_init(
@@ -525,13 +518,10 @@ int lookup_paths_init(
add = strv_new(persistent_config,
USER_CONFIG_UNIT_DIR,
"/etc/systemd/user",
@@ -95,7 +95,7 @@ index 3ddbda0e9f..3eddc80c90 100644
break;
case RUNTIME_SCOPE_USER:
@@ -648,7 +638,6 @@ void lookup_paths_log(LookupPaths *lp) {
@@ -670,7 +660,6 @@ void lookup_paths_log(LookupPaths *lp) {
static const char* const system_generator_paths[] = {
"/run/systemd/system-generators",
"/etc/systemd/system-generators",
@@ -103,7 +103,7 @@ index 3ddbda0e9f..3eddc80c90 100644
SYSTEM_GENERATOR_DIR,
NULL,
};
@@ -656,7 +645,6 @@ static const char* const system_generator_paths[] = {
@@ -678,7 +667,6 @@ static const char* const system_generator_paths[] = {
static const char* const user_generator_paths[] = {
"/run/systemd/user-generators",
"/etc/systemd/user-generators",
@@ -111,7 +111,7 @@ index 3ddbda0e9f..3eddc80c90 100644
USER_GENERATOR_DIR,
NULL,
};
@@ -664,7 +652,6 @@ static const char* const user_generator_paths[] = {
@@ -686,7 +674,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",
@@ -119,7 +119,7 @@ index 3ddbda0e9f..3eddc80c90 100644
SYSTEM_ENV_GENERATOR_DIR,
NULL,
};
@@ -672,7 +659,6 @@ static const char* const system_env_generator_paths[] = {
@@ -694,7 +681,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",

4
pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch
View File

@@ -13,10 +13,10 @@ in containers.
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/core/manager.c b/src/core/manager.c
index d85896577f..2a4782a55e 100644
index 7938c989af..c1ae20dfc0 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1575,7 +1575,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) {
@@ -1578,7 +1578,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) {
if (!unit_is_bound_by_inactive(u, &culprit))
continue;

6
pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch
View File

@@ -11,7 +11,7 @@ Subject: [PATCH] hostnamed, localed, timedated: disable methods that change
3 files changed, 25 insertions(+)
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index 06fb3f2878..b656e511b7 100644
index fbe1b2fa7a..30e7c75279 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -1388,6 +1388,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_
@@ -35,7 +35,7 @@ index 06fb3f2878..b656e511b7 100644
context_read_machine_info(c);
diff --git a/src/locale/localed.c b/src/locale/localed.c
index 11d9130bbc..dd4d9e59ea 100644
index 041ba29cd8..02fbe3e278 100644
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -221,6 +221,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er
@@ -69,7 +69,7 @@ index 11d9130bbc..dd4d9e59ea 100644
r = x11_context_verify_and_warn(&in, LOG_ERR, error);
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 662cc29ac5..57f3413dc6 100644
index d1ef772b56..9b1fe439f1 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -678,6 +678,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *

24
pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
View File

@@ -35,10 +35,10 @@ index 3a13e04a27..4fd58068a1 100644
<literal>Etc/UTC</literal>. The resulting link should lead to the
corresponding binary
diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index 55931a2546..2e00bd7539 100644
index 8c776960e1..2e0563bd00 100644
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -1410,7 +1410,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) {
@@ -1443,7 +1443,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) {
assert(ret);
@@ -47,7 +47,7 @@ index 55931a2546..2e00bd7539 100644
if (!f)
return -errno;
@@ -1451,7 +1451,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) {
@@ -1488,7 +1488,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) {
assert(ret);
@@ -56,7 +56,7 @@ index 55931a2546..2e00bd7539 100644
if (!f)
return -errno;
@@ -1562,7 +1562,7 @@ int verify_timezone(const char *name, int log_level) {
@@ -1603,7 +1603,7 @@ int verify_timezone(const char *name, int log_level) {
if (p - name >= PATH_MAX)
return -ENAMETOOLONG;
@@ -65,7 +65,7 @@ index 55931a2546..2e00bd7539 100644
fd = open(t, O_RDONLY|O_CLOEXEC);
if (fd < 0)
@@ -1614,7 +1614,7 @@ int get_timezone(char **ret) {
@@ -1675,7 +1675,7 @@ int get_timezone(char **ret) {
if (r < 0)
return r; /* Return EINVAL if not a symlink */
@@ -75,19 +75,19 @@ index 55931a2546..2e00bd7539 100644
return -EINVAL;
if (!timezone_is_valid(e, LOG_DEBUG))
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index 5ed6d3a9d2..f922d91a9d 100644
index 55bd273f21..d00aa16592 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -618,7 +618,7 @@ static int prompt_timezone(int rfd) {
@@ -571,7 +571,7 @@ static int prompt_timezone(int rfd, sd_varlink **mute_console_link) {
static int process_timezone(int rfd) {
static int process_timezone(int rfd, sd_varlink **mute_console_link) {
_cleanup_close_ int pfd = -EBADF;
- _cleanup_free_ char *f = NULL, *relpath = NULL;
+ _cleanup_free_ char *f = NULL;
const char *e;
int r;
@@ -664,12 +664,9 @@ static int process_timezone(int rfd) {
@@ -617,12 +617,9 @@ static int process_timezone(int rfd, sd_varlink **mute_console_link) {
if (isempty(arg_timezone))
return 0;
@@ -103,10 +103,10 @@ index 5ed6d3a9d2..f922d91a9d 100644
return log_error_errno(r, "Failed to create /etc/localtime symlink: %m");
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 480a9c55c6..02c9ae6608 100644
index 05e6be8874..6dc00ff416 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1821,8 +1821,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid
@@ -1808,8 +1808,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid
static const char *timezone_from_path(const char *path) {
return PATH_STARTSWITH_SET(
path,
@@ -118,7 +118,7 @@ index 480a9c55c6..02c9ae6608 100644
static bool etc_writable(void) {
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 57f3413dc6..6a456fe601 100644
index 9b1fe439f1..916886aeff 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -266,7 +266,7 @@ static int context_read_data(Context *c) {

16
pkgs/os-specific/linux/systemd/0008-localectl-use-etc-X11-xkb-for-list-x11.patch
View File

@@ -10,15 +10,15 @@ NixOS has an option to link the xkb data files to /etc/X11, but not to
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index c595f81b40..90033f6566 100644
index 63703007ad..50def81940 100644
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -302,7 +302,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) {
} state = NONE, look_for;
int r;
@@ -295,7 +295,7 @@ static const char* xkb_directory(void) {
static const char *cached = NULL;
- f = fopen("/usr/share/X11/xkb/rules/base.lst", "re");
+ f = fopen("/etc/X11/xkb/rules/base.lst", "re");
if (!f)
return log_error_errno(errno, "Failed to open keyboard mapping list: %m");
if (!cached)
- cached = secure_getenv("SYSTEMD_XKB_DIRECTORY") ?: "/usr/share/X11/xkb";
+ cached = secure_getenv("SYSTEMD_XKB_DIRECTORY") ?: "/etc/X11/xkb";
return cached;
}

2
pkgs/os-specific/linux/systemd/0009-add-rootprefix-to-lookup-dir-paths.patch
View File

@@ -12,7 +12,7 @@ files that I might have missed.
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/basic/constants.h b/src/basic/constants.h
index 7a09fbf878..ee3378f109 100644
index a26cff4062..3800c37e1b 100644
--- a/src/basic/constants.h
+++ b/src/basic/constants.h
@@ -40,13 +40,15 @@

4
pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
View File

@@ -10,10 +10,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable.
1 file changed, 1 insertion(+)
diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
index 3317068e47..021a3c0699 100644
index 25882970ef..599dd0a63f 100644
--- a/src/shutdown/shutdown.c
+++ b/src/shutdown/shutdown.c
@@ -358,6 +358,7 @@ static void notify_supervisor(void) {
@@ -329,6 +329,7 @@ static void notify_supervisor(void) {
int main(int argc, char *argv[]) {
static const char* const dirs[] = {
SYSTEM_SHUTDOWN_PATH,

2
pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
View File

@@ -9,7 +9,7 @@ This is needed for NixOS to use such scripts as systemd directory is immutable.
1 file changed, 1 insertion(+)
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index 3390ebe0c0..affc823bc4 100644
index 4fa6f16fcd..012cf16f90 100644
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -248,6 +248,7 @@ static int execute(

2
pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
View File

@@ -10,7 +10,7 @@ systemd itself uses extensively.
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/basic/path-util.h b/src/basic/path-util.h
index a3a82574dd..b836dba7f1 100644
index 5b2baef4e1..7f366e4544 100644
--- a/src/basic/path-util.h
+++ b/src/basic/path-util.h
@@ -9,11 +9,11 @@

4
pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch
View File

@@ -16,10 +16,10 @@ executables that are being called from managers.
1 file changed, 8 insertions(+)
diff --git a/src/core/manager.c b/src/core/manager.c
index 2a4782a55e..8dfdc227a1 100644
index c1ae20dfc0..c120e555a2 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -3977,9 +3977,17 @@ static int build_generator_environment(Manager *m, char ***ret) {
@@ -3994,9 +3994,17 @@ static int build_generator_environment(Manager *m, char ***ret) {
* adjust generated units to that. Let's pass down some bits of information that are easy for us to
* determine (but a bit harder for generator scripts to determine), as environment variables. */

6
pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch
View File

@@ -27,10 +27,10 @@ filename_is_valid with path_is_valid.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c
index 57e7a91f93..faf45e4807 100644
index e089cfbc5e..35e135945b 100644
--- a/src/shared/tpm2-util.c
+++ b/src/shared/tpm2-util.c
@@ -724,7 +724,7 @@ int tpm2_context_new(const char *device, Tpm2Context **ret_context) {
@@ -741,7 +741,7 @@ int tpm2_context_new(const char *device, Tpm2Context **ret_context) {
fn = strjoina("libtss2-tcti-", driver, ".so.0");
/* Better safe than sorry, let's refuse strings that cannot possibly be valid driver early, before going to disk. */
@@ -38,4 +38,4 @@ index 57e7a91f93..faf45e4807 100644
+ if (!path_is_valid(fn))
return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "TPM2 driver name '%s' not valid, refusing.", driver);
context->tcti_dl = dlopen(fn, RTLD_NOW|RTLD_NODELETE);
const char *dle = NULL;

6
pkgs/os-specific/linux/systemd/0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch
View File

@@ -30,11 +30,11 @@ are written into `$XDG_CONFIG_HOME/systemd/user`.
1 file changed, 3 insertions(+)
diff --git a/src/systemctl/systemctl-edit.c b/src/systemctl/systemctl-edit.c
index 53bc57186a..0ed12ce931 100644
index a28180922a..22c9c8fdbd 100644
--- a/src/systemctl/systemctl-edit.c
+++ b/src/systemctl/systemctl-edit.c
@@ -330,6 +330,9 @@ int verb_edit(int argc, char *argv[], void *userdata) {
sd_bus *bus;
@@ -336,6 +336,9 @@ int verb_edit(int argc, char *argv[], void *userdata) {
sd_bus *bus = NULL;
int r;
+ if (!arg_runtime && arg_runtime_scope == RUNTIME_SCOPE_SYSTEM)

4
pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch
View File

@@ -8,10 +8,10 @@ Subject: [PATCH] meson.build: do not create systemdstatedir
1 file changed, 1 deletion(-)
diff --git a/meson.build b/meson.build
index 238b935372..b0b67c9b99 100644
index 4746146a98..c13b72af56 100644
--- a/meson.build
+++ b/meson.build
@@ -2791,7 +2791,6 @@ install_data('LICENSE.GPL2',
@@ -2859,7 +2859,6 @@ install_data('LICENSE.GPL2',
install_subdir('LICENSES',
install_dir : docdir)

4
pkgs/os-specific/linux/systemd/0018-meson-Don-t-link-ssh-dropins.patch
View File

@@ -8,10 +8,10 @@ Subject: [PATCH] meson: Don't link ssh dropins
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index b0b67c9b99..4721b7482b 100644
index c13b72af56..32f6e791e7 100644
--- a/meson.build
+++ b/meson.build
@@ -219,13 +219,13 @@ sshconfdir = get_option('sshconfdir')
@@ -214,13 +214,13 @@ sshconfdir = get_option('sshconfdir')
if sshconfdir == ''
sshconfdir = sysconfdir / 'ssh/ssh_config.d'
endif

2
pkgs/os-specific/linux/systemd/0019-install-unit_file_exists_full-follow-symlinks.patch
View File

@@ -8,7 +8,7 @@ Subject: [PATCH] install: unit_file_exists_full: follow symlinks
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/install.c b/src/shared/install.c
index 8195436564..dfbc35f357 100644
index a22c6df2f7..7e900c8bcd 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -3227,7 +3227,7 @@ int unit_file_exists_full(RuntimeScope scope, const LookupPaths *lp, const char

4
pkgs/os-specific/linux/systemd/0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
View File

@@ -13,7 +13,7 @@ directly.
1 file changed, 11 insertions(+)
diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c
index 40305c046b..c3ed57c54e 100644
index 96d0dd5c2b..ee7cc4bd17 100644
--- a/src/timesync/timesyncd.c
+++ b/src/timesync/timesyncd.c
@@ -25,6 +25,11 @@
@@ -28,7 +28,7 @@ index 40305c046b..c3ed57c54e 100644
static int advance_tstamp(int fd, usec_t epoch) {
assert(fd >= 0);
@@ -203,6 +208,12 @@ static int run(int argc, char *argv[]) {
@@ -204,6 +209,12 @@ static int run(int argc, char *argv[]) {
if (r < 0)
return log_error_errno(r, "Failed to parse fallback server strings: %m");

25
pkgs/os-specific/linux/systemd/default.nix
View File

@@ -203,17 +203,17 @@ let
# command:
# $ curl -s https://api.github.com/repos/systemd/systemd/releases/latest | \
# jq '.created_at|strptime("%Y-%m-%dT%H:%M:%SZ")|mktime'
releaseTimestamp = "1734643670";
releaseTimestamp = "1766012573";
in
stdenv.mkDerivation (finalAttrs: {
inherit pname;
version = "258.3";
version = "259";
src = fetchFromGitHub {
owner = "systemd";
repo = "systemd";
rev = "v${finalAttrs.version}";
hash = "sha256-wpg/0z7xrB8ysPaa/zNp1mz+yYRCGyXz0ODZcKapovM=";
hash = "sha256-lJUX1sWRouhEEPZoA9UjjOy5IUZYGGV8pltAU0E4Dsg=";
};
# On major changes, or when otherwise required, you *must* :
@@ -481,6 +481,10 @@ stdenv.mkDerivation (finalAttrs: {
(lib.mesonOption "mount-path" "${lib.getOutput "mount" util-linux}/bin/mount")
(lib.mesonOption "umount-path" "${lib.getOutput "mount" util-linux}/bin/umount")
# Swap
(lib.mesonOption "swapon-path" "${lib.getOutput "swap" util-linux}/sbin/swapon")
(lib.mesonOption "swapoff-path" "${lib.getOutput "swap" util-linux}/sbin/swapoff")
# SSH
(lib.mesonOption "sshconfdir" "")
(lib.mesonOption "sshdconfdir" "no")
@@ -620,19 +624,6 @@ stdenv.mkDerivation (finalAttrs: {
"man/systemd-makefs@.service.xml"
];
}
{
search = "/sbin/swapon";
replacement = "${lib.getOutput "swap" util-linux}/sbin/swapon";
where = [
"src/core/swap.c"
"src/basic/unit-def.h"
];
}
{
search = "/sbin/swapoff";
replacement = "${lib.getOutput "swap" util-linux}/sbin/swapoff";
where = [ "src/core/swap.c" ];
}
{
search = "/bin/echo";
replacement = "${coreutils}/bin/echo";
@@ -788,7 +779,7 @@ stdenv.mkDerivation (finalAttrs: {
]
);
doCheck = true;
doCheck = false;
# trigger the test -n "$DESTDIR" || mutate in upstreams build system
preInstall = ''