systemd: Add an option for homed
This is disabled by default to indicate that is hasn't been adiquately tested with NixOS yet.
This commit is contained in:
parent
cb764dbc24
commit
7787fd2413
|
@ -16,6 +16,7 @@ store again, while having executables looking up files in /etc.
|
||||||
network/meson.build | 2 +-
|
network/meson.build | 2 +-
|
||||||
src/core/meson.build | 10 +++++-----
|
src/core/meson.build | 10 +++++-----
|
||||||
src/coredump/meson.build | 2 +-
|
src/coredump/meson.build | 2 +-
|
||||||
|
src/home/meson.build | 2 +-
|
||||||
src/journal-remote/meson.build | 4 ++--
|
src/journal-remote/meson.build | 4 ++--
|
||||||
src/journal/meson.build | 2 +-
|
src/journal/meson.build | 2 +-
|
||||||
src/kernel-install/meson.build | 2 +-
|
src/kernel-install/meson.build | 2 +-
|
||||||
|
@ -28,7 +29,7 @@ store again, while having executables looking up files in /etc.
|
||||||
sysctl.d/meson.build | 2 +-
|
sysctl.d/meson.build | 2 +-
|
||||||
tmpfiles.d/meson.build | 2 +-
|
tmpfiles.d/meson.build | 2 +-
|
||||||
units/meson.build | 2 +-
|
units/meson.build | 2 +-
|
||||||
17 files changed, 29 insertions(+), 26 deletions(-)
|
18 files changed, 30 insertions(+), 27 deletions(-)
|
||||||
|
|
||||||
diff --git a/hwdb.d/meson.build b/hwdb.d/meson.build
|
diff --git a/hwdb.d/meson.build b/hwdb.d/meson.build
|
||||||
index 5c77387a26..6404bc01ba 100644
|
index 5c77387a26..6404bc01ba 100644
|
||||||
|
@ -144,6 +145,17 @@ index 7fa5942697..34c865dfa0 100644
|
||||||
endif
|
endif
|
||||||
|
|
||||||
tests += [
|
tests += [
|
||||||
|
diff --git a/src/home/meson.build b/src/home/meson.build
|
||||||
|
index 797f3a3c6d..232904ab42 100644
|
||||||
|
--- a/src/home/meson.build
|
||||||
|
+++ b/src/home/meson.build
|
||||||
|
@@ -98,5 +98,5 @@ if conf.get('ENABLE_HOMED') == 1
|
||||||
|
install_dir : polkitpolicydir)
|
||||||
|
|
||||||
|
install_data('homed.conf',
|
||||||
|
- install_dir : pkgsysconfdir)
|
||||||
|
+ install_dir : factoryconfdir)
|
||||||
|
endif
|
||||||
diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build
|
diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build
|
||||||
index 87b8ba6495..daff8ec967 100644
|
index 87b8ba6495..daff8ec967 100644
|
||||||
--- a/src/journal-remote/meson.build
|
--- a/src/journal-remote/meson.build
|
||||||
|
|
|
@ -78,6 +78,8 @@
|
||||||
, withTimedated ? true
|
, withTimedated ? true
|
||||||
, withTimesyncd ? true
|
, withTimesyncd ? true
|
||||||
, withUserDb ? true
|
, withUserDb ? true
|
||||||
|
, withHomed ? false, p11-kit, libfido2
|
||||||
|
# , withPortabled ? false TODO
|
||||||
|
|
||||||
# name argument
|
# name argument
|
||||||
, pname ? "systemd"
|
, pname ? "systemd"
|
||||||
|
@ -98,8 +100,11 @@ assert withEfi -> (gnu-efi != null);
|
||||||
assert withRemote -> lib.getDev curl != null;
|
assert withRemote -> lib.getDev curl != null;
|
||||||
assert withCoredump -> withCompression;
|
assert withCoredump -> withCompression;
|
||||||
|
|
||||||
|
assert withHomed -> withCryptsetup;
|
||||||
|
|
||||||
assert withCryptsetup ->
|
assert withCryptsetup ->
|
||||||
(cryptsetup != null);
|
(cryptsetup != null);
|
||||||
|
|
||||||
let
|
let
|
||||||
wantCurl = withRemote || withImportd;
|
wantCurl = withRemote || withImportd;
|
||||||
|
|
||||||
|
@ -203,6 +208,7 @@ stdenv.mkDerivation {
|
||||||
++ lib.optional withResolved libgpgerror
|
++ lib.optional withResolved libgpgerror
|
||||||
++ lib.optional withSelinux libselinux
|
++ lib.optional withSelinux libselinux
|
||||||
++ lib.optional withRemote libmicrohttpd
|
++ lib.optional withRemote libmicrohttpd
|
||||||
|
++ lib.optionals withHomed [ p11-kit libfido2 ]
|
||||||
;
|
;
|
||||||
|
|
||||||
#dontAddPrefix = true;
|
#dontAddPrefix = true;
|
||||||
|
@ -226,7 +232,7 @@ stdenv.mkDerivation {
|
||||||
"-Dgcrypt=${lib.boolToString (libgcrypt != null)}"
|
"-Dgcrypt=${lib.boolToString (libgcrypt != null)}"
|
||||||
"-Dimportd=${lib.boolToString withImportd}"
|
"-Dimportd=${lib.boolToString withImportd}"
|
||||||
"-Dlz4=${lib.boolToString withCompression}"
|
"-Dlz4=${lib.boolToString withCompression}"
|
||||||
"-Dhomed=false"
|
"-Dhomed=${stdenv.lib.boolToString withHomed}"
|
||||||
"-Dlogind=${lib.boolToString withLogind}"
|
"-Dlogind=${lib.boolToString withLogind}"
|
||||||
"-Dlocaled=${lib.boolToString withLocaled}"
|
"-Dlocaled=${lib.boolToString withLocaled}"
|
||||||
"-Dhostnamed=${lib.boolToString withHostnamed}"
|
"-Dhostnamed=${lib.boolToString withHostnamed}"
|
||||||
|
|
Loading…
Reference in a new issue