diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-11 14:33:12 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-11 14:36:08 -0400 |
| commit | ee4b56edd364922c6a20a8d7b21a5a72497b4bc2 (patch) | |
| tree | 42bd2a09efe21aa446e411201d4974d39f8a8a4f /pkgs/os-specific/linux/systemd | |
| parent | 73833ee4465369c9eead8e00ce699053e010de2f (diff) | |
| parent | 62ee7b7b4713c90048ec7063ca4f4cd7677eeb53 (diff) | |
| download | nixlib-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.tar nixlib-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.tar.gz nixlib-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.tar.bz2 nixlib-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.tar.lz nixlib-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.tar.xz nixlib-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.tar.zst nixlib-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 1c5dd6dadf1b..89bd123d9382 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod , zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor -, audit, lz4, bzip2, kexectools, libmicrohttpd, pcre2 +, audit, lz4, bzip2, libmicrohttpd, pcre2 , linuxHeaders ? stdenv.cc.libc.linuxHeaders -, libseccomp, iptables, gnu-efi +, iptables, gnu-efi , autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45 , ninja, meson, python3Packages, glibcLocales , patchelf @@ -11,6 +11,8 @@ , hostPlatform , buildPackages , withSelinux ? false, libselinux +, withLibseccomp ? libseccomp.meta.available, libseccomp +, withKexectools ? kexectools.meta.available, kexectools }: let @@ -42,13 +44,13 @@ in stdenv.mkDerivation rec { [ linuxHeaders libcap kmod xz pam acl /* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2 libmicrohttpd pcre2 ] ++ - stdenv.lib.meta.enableIfAvailable kexectools ++ - stdenv.lib.meta.enableIfAvailable libseccomp ++ + stdenv.lib.optional withKexectools kexectools ++ + stdenv.lib.optional withLibseccomp libseccomp ++ [ libffi audit lz4 bzip2 libapparmor iptables gnu-efi # This is actually native, but we already pull it from buildPackages pythonLxmlEnv - ] ++ stdenv.lib.optionals withSelinux [ libselinux ]; + ] ++ stdenv.lib.optional withSelinux libselinux; #dontAddPrefix = true; |