Merge pull request #158353 from symphorien/collectd-xen-insecure-master

collectd: don't build with xen plugin by default
This commit is contained in:
Guillaume Girol 2022-02-09 19:13:10 +00:00 committed by GitHub
commit 7a6506fc79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -41,8 +41,8 @@
, xen
, yajl
, IOKit
# Defaults to `null` for all supported plugins,
# list of plugin names for a custom build
# Defaults to `null` for all supported plugins (except xen, which is marked as
# insecure), otherwise a list of plugin names for a custom build
, enabledPlugins ? null
, ...
}:
@ -136,7 +136,7 @@ let
buildInputs =
if enabledPlugins == null
then builtins.concatMap pluginBuildInputs
(builtins.attrNames plugins)
(builtins.attrNames (builtins.removeAttrs plugins ["xencpu"]))
else builtins.concatMap pluginBuildInputs enabledPlugins;
in {
inherit configureFlags buildInputs;