mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 08:31:59 +00:00
Code Issues Wiki Activity

systemd: Add an option for homed

Browse source 
This is disabled by default to indicate that is hasn't been adiquately
tested with NixOS yet.
This commit is contained in:
Finn Behrens 2020-10-10 12:05:31 +02:00 committed by John Ericson
parent cb764dbc24
commit 7787fd2413
2 changed files with 31 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch
View file

@ -16,6 +16,7 @@ store again, while having executables looking up files in /etc.
network/meson.build | 2 +-
src/core/meson.build | 10 +++++-----
src/coredump/meson.build | 2 +-
src/home/meson.build | 2 +-
src/journal-remote/meson.build | 4 ++--
src/journal/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 +-
tmpfiles.d/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
index 5c77387a26..6404bc01ba 100644
@ -144,6 +145,17 @@ index 7fa5942697..34c865dfa0 100644
endif
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
index 87b8ba6495..daff8ec967 100644
--- a/src/journal-remote/meson.build

30
pkgs/os-specific/linux/systemd/default.nix
View file

@ -78,6 +78,8 @@
, withTimedated ? true
, withTimesyncd ? true
, withUserDb ? true
, withHomed ? false, p11-kit, libfido2
# , withPortabled ? false TODO
# name argument
, pname ? "systemd"
@ -98,8 +100,11 @@ assert withEfi -> (gnu-efi != null);
assert withRemote -> lib.getDev curl != null;
assert withCoredump -> withCompression;
assert withHomed -> withCryptsetup;
assert withCryptsetup ->
(cryptsetup != null);
let
wantCurl = withRemote || withImportd;
@ -191,18 +196,19 @@ stdenv.mkDerivation {
pam
]
++ lib.optional withApparmor libapparmor
++ lib.optional wantCurl (lib.getDev curl)
++ lib.optional withApparmor libapparmor
++ lib.optional wantCurl (lib.getDev curl)
++ lib.optionals withCompression [ bzip2 lz4 xz ]
++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev)
++ lib.optional withEfi gnu-efi
++ lib.optional withKexectools kexectools
++ lib.optional withLibseccomp libseccomp
++ lib.optional withNetworkd iptables
++ lib.optional withPCRE2 pcre2
++ lib.optional withResolved libgpgerror
++ lib.optional withSelinux libselinux
++ lib.optional withRemote libmicrohttpd
++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev)
++ lib.optional withEfi gnu-efi
++ lib.optional withKexectools kexectools
++ lib.optional withLibseccomp libseccomp
++ lib.optional withNetworkd iptables
++ lib.optional withPCRE2 pcre2
++ lib.optional withResolved libgpgerror
++ lib.optional withSelinux libselinux
++ lib.optional withRemote libmicrohttpd
++ lib.optionals withHomed [ p11-kit libfido2 ]
;
#dontAddPrefix = true;
@ -226,7 +232,7 @@ stdenv.mkDerivation {
"-Dgcrypt=${lib.boolToString (libgcrypt != null)}"
"-Dimportd=${lib.boolToString withImportd}"
"-Dlz4=${lib.boolToString withCompression}"
"-Dhomed=false"
"-Dhomed=${stdenv.lib.boolToString withHomed}"
"-Dlogind=${lib.boolToString withLogind}"
"-Dlocaled=${lib.boolToString withLocaled}"
"-Dhostnamed=${lib.boolToString withHostnamed}"