treewide: remove lib.meta.enableIfAvailable

Changed files
+10 -9
lib
pkgs
os-specific
linux
systemd
tools
package-management
-2
lib/meta.nix
···
then { system = elem; }
else { parsed = elem; };
in lib.matchAttrs pattern platform;
-
-
enableIfAvailable = p: if p.meta.available or true then [ p ] else [];
}
+7 -5
pkgs/os-specific/linux/systemd/default.nix
···
{ 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
···
, hostPlatform
, buildPackages
, withSelinux ? false, libselinux
+
, withLibseccomp ? libseccomp.meta.available, libseccomp
+
, withKexectools ? kexectools.meta.available, kexectools
}:
let
···
[ 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;
+3 -2
pkgs/tools/package-management/nix/default.nix
···
{ lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz
, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, boost
, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl
-
, libseccomp, busybox-sandbox-shell
+
, busybox-sandbox-shell
, hostPlatform, buildPlatform
, storeDir ? "/nix/store"
, stateDir ? "/nix/var"
, confDir ? "/etc"
+
, withLibseccomp ? libseccomp.meta.available, libseccomp
}:
let
···
buildInputs = [ curl openssl sqlite xz bzip2 ]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
++ lib.optionals is20 [ brotli ] # Since 1.12
-
++ lib.meta.enableIfAvailable libseccomp
+
++ lib.optional withLibseccomp libseccomp
++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20)
(aws-sdk-cpp.override {
apis = ["s3"];