diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-10-01 19:41:36 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2018-10-01 19:42:07 +0200 |
| commit | 1383c08f2c086cb0b90c8624ebab4ca1182e3384 (patch) | |
| tree | cce12f1295915db0a6861f148715764ad64ce0c9 /pkgs/os-specific/linux/systemd | |
| parent | 9c4b11e9a060de2175aef4d36881f97812ab17fe (diff) | |
| parent | 83fd9785f65b8fd4cbaa146270f90b2a0d74b5f3 (diff) | |
| download | nixpkgs-1383c08f2c086cb0b90c8624ebab4ca1182e3384.tar nixpkgs-1383c08f2c086cb0b90c8624ebab4ca1182e3384.tar.gz nixpkgs-1383c08f2c086cb0b90c8624ebab4ca1182e3384.tar.bz2 nixpkgs-1383c08f2c086cb0b90c8624ebab4ca1182e3384.tar.lz nixpkgs-1383c08f2c086cb0b90c8624ebab4ca1182e3384.tar.xz nixpkgs-1383c08f2c086cb0b90c8624ebab4ca1182e3384.tar.zst nixpkgs-1383c08f2c086cb0b90c8624ebab4ca1182e3384.zip | |
Merge branch 'master' into staging-next
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 dd8105c8c05..db64b8e6f6d 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 |