diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix index 7ad3af0036cfcd4..f6341f1b5ebadcf 100644 --- a/nixos/modules/programs/gnupg.nix +++ b/nixos/modules/programs/gnupg.nix @@ -64,7 +64,8 @@ in }; agent.pinentryFlavor = mkOption { - type = types.nullOr (types.enum pkgs.pinentry.flavors); + # keep in sync with all possible favlors of pinentry + type = types.nullOr (types.enum [ "curses" "tty" "emacs" "gtk2" "gnome3" "qt" ]); example = "gnome3"; default = defaultPinentryFlavor; defaultText = literalMD ''matching the configured desktop environment''; @@ -232,7 +233,4 @@ in } ]; }; - - # uses attributes of the linked package - meta.buildDocsInSandbox = false; } diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index dca48f4e21087f3..e2544a9c504348a 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -22,6 +22,7 @@ let lib.optionalString (flag != null) (lib.enableFeature (lib.elem f enabledFlavors) ("pinentry-" + flag)); + # keep in sync with programs.gnupg.agent.pinentryFlavor flavorInfo = { curses = { bin = "curses"; flag = "curses"; buildInputs = [ ncurses ]; }; tty = { bin = "tty"; flag = "tty"; };