diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-09 16:13:38 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-09 16:21:22 -0500 |
| commit | c37b93bd52f3f5a0dd6ba2a41823c56e7f31f71e (patch) | |
| tree | b87722066b6e7e83fa4a650ef84932b997b4ce58 /pkgs/os-specific/linux/systemd/default.nix | |
| parent | 8a98cf97e92cecba4feda766f4b7ac36cd82f8ea (diff) | |
| download | nixlib-c37b93bd52f3f5a0dd6ba2a41823c56e7f31f71e.tar nixlib-c37b93bd52f3f5a0dd6ba2a41823c56e7f31f71e.tar.gz nixlib-c37b93bd52f3f5a0dd6ba2a41823c56e7f31f71e.tar.bz2 nixlib-c37b93bd52f3f5a0dd6ba2a41823c56e7f31f71e.tar.lz nixlib-c37b93bd52f3f5a0dd6ba2a41823c56e7f31f71e.tar.xz nixlib-c37b93bd52f3f5a0dd6ba2a41823c56e7f31f71e.tar.zst nixlib-c37b93bd52f3f5a0dd6ba2a41823c56e7f31f71e.zip | |
treewide: remove lib.meta.enableIfAvailable
Diffstat (limited to 'pkgs/os-specific/linux/systemd/default.nix')
| -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 58a1c7ca7147..c1f139d42a64 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 +, audit, lz4, bzip2, libmicrohttpd , 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 ] ++ - 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; |