Revert "helpers: add mkPackageOption + refactoring (#144)" (#149)

This reverts commit b724085447.
This commit is contained in:
Pedro Alves 2023-01-25 00:03:26 +00:00 committed by GitHub
parent b724085447
commit 2d54272177
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
58 changed files with 258 additions and 94 deletions

View file

@ -92,12 +92,6 @@ rec {
mkEnumFirstDefault = enum: mkEnum enum (head enum);
};
mkPackageOption = name: default: mkOption {
type = types.package;
inherit default;
description = "Plugin to use for ${name}";
};
mkPlugin = { config, lib, ... }: { name
, description
, package ? null
@ -118,7 +112,11 @@ rec {
options;
# does this evaluate package?
packageOption = if package == null then { } else {
package = mkPackageOption name package;
package = mkOption {
type = types.package;
default = package;
description = "Plugin to use for ${name}";
};
};
in
{