diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-09-03 21:09:27 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-09-28 15:01:00 +0300 |
| commit | fe7919f7a135788f5ea81bf94b6eb33ac95a85cd (patch) | |
| tree | 777fe9889486df27345d6d75e081fd2a4c4638c8 /pkgs/os-specific/linux/systemd | |
| parent | 1d65e473e705c7be5ebfe079d0311c3a5eeaf462 (diff) | |
| download | nixpkgs-fe7919f7a135788f5ea81bf94b6eb33ac95a85cd.tar nixpkgs-fe7919f7a135788f5ea81bf94b6eb33ac95a85cd.tar.gz nixpkgs-fe7919f7a135788f5ea81bf94b6eb33ac95a85cd.tar.bz2 nixpkgs-fe7919f7a135788f5ea81bf94b6eb33ac95a85cd.tar.lz nixpkgs-fe7919f7a135788f5ea81bf94b6eb33ac95a85cd.tar.xz nixpkgs-fe7919f7a135788f5ea81bf94b6eb33ac95a85cd.tar.zst nixpkgs-fe7919f7a135788f5ea81bf94b6eb33ac95a85cd.zip | |
systemd: Replace meta.available checks
This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 482e3e0bc79..96c82a6d9f8 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod +{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod , xz, pam, acl, libuuid, m4, utillinux, libffi , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor , audit, lz4, bzip2, libmicrohttpd, pcre2 @@ -10,8 +10,8 @@ , getent , buildPackages , withSelinux ? false, libselinux -, withLibseccomp ? libseccomp.meta.available, libseccomp -, withKexectools ? kexectools.meta.available, kexectools +, withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp +, withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools }: let |