diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-09-13 12:02:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-13 12:02:05 +0000 |
| commit | 0b07cb1528ab1c42820b11d6b21f463f61857588 (patch) | |
| tree | 543e0d6c7f781d7806654bda79456c284a429b9a /pkgs/os-specific/linux/systemd/default.nix | |
| parent | 9130789e8025a6b846d5c4d08a5d620bb403c5aa (diff) | |
| parent | 3d38bd5b78885137e307cd6a2ad1990c7e91acdf (diff) | |
| download | nixpkgs-0b07cb1528ab1c42820b11d6b21f463f61857588.tar nixpkgs-0b07cb1528ab1c42820b11d6b21f463f61857588.tar.gz nixpkgs-0b07cb1528ab1c42820b11d6b21f463f61857588.tar.bz2 nixpkgs-0b07cb1528ab1c42820b11d6b21f463f61857588.tar.lz nixpkgs-0b07cb1528ab1c42820b11d6b21f463f61857588.tar.xz nixpkgs-0b07cb1528ab1c42820b11d6b21f463f61857588.tar.zst nixpkgs-0b07cb1528ab1c42820b11d6b21f463f61857588.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific/linux/systemd/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index e158cba54e6..a14883ff5f2 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -100,6 +100,7 @@ , withTimesyncd ? true , withTpm2Tss ? !stdenv.hostPlatform.isMusl , withUserDb ? !stdenv.hostPlatform.isMusl +, withUtmp ? !stdenv.hostPlatform.isMusl # tests assume too much system access for them to be feasible for us right now , withTests ? false @@ -502,9 +503,10 @@ stdenv.mkDerivation { "-Dbpf-framework=true" ] ++ lib.optionals withTpm2Tss [ "-Dtpm2=true" + ] ++ lib.optionals (!withUtmp) [ + "-Dutmp=false" ] ++ lib.optionals stdenv.hostPlatform.isMusl [ "-Dgshadow=false" - "-Dutmp=false" "-Didn=false" ]; preConfigure = @@ -683,7 +685,7 @@ stdenv.mkDerivation { # runtime; otherwise we can't and we need to reboot. interfaceVersion = 2; - inherit withCryptsetup withHostnamed withImportd withLocaled withMachined withTimedated util-linux kmod kbd; + inherit withCryptsetup withHostnamed withImportd withLocaled withMachined withTimedated withUtmp util-linux kmod kbd; tests = { inherit (nixosTests) switchTest; |