pinentry-*: build dependent variant with an override instead of choos…

…ing the output

We don't want to depend on the *enabled* flavors of pinentry but on all
*possible* ones.

nixos/modules/programs/gnupg.nix

@@ -66,7 +66,7 @@ in
     };
 
     agent.pinentryFlavor = mkOption {
-      type = types.nullOr (types.enum pkgs.pinentry.flavors);
+      type = types.nullOr (types.enum pkgs.pinentry.possibleFlavors);
       example = "gnome3";
       default = defaultPinentryFlavor;
       defaultText = literalMD ''matching the configured desktop environment'';

pkgs/tools/security/pinentry/default.nix

@@ -84,7 +84,10 @@ pinentryMkDerivation rec {
 
   outputs = [ "out" ] ++ enabledFlavors;
 
-  passthru = { flavors = enabledFlavors; };
+  passthru = {
+    flavors = enabledFlavors;
+    possibleFlavors = lib.attrNames flavorInfo;
+  };
 
   meta = with lib; {
     homepage = "http://gnupg.org/aegypten2/";

pkgs/top-level/all-packages.nix

@@ -12070,11 +12070,11 @@ with pkgs;
 
   pinentry = libsForQt5.callPackage ../tools/security/pinentry { };
 
-  pinentry-curses = (lib.getOutput "curses" pinentry);
-  pinentry-emacs = (lib.getOutput "emacs" pinentry);
-  pinentry-gtk2 = (lib.getOutput "gtk2" pinentry);
-  pinentry-qt = (lib.getOutput "qt" pinentry);
-  pinentry-gnome = (lib.getOutput "gnome3" pinentry);
+  pinentry-curses = pinentry.override { enabledFlavors = [ "curses" ]; };
+  pinentry-emacs = pinentry.override { enabledFlavors = [ "emacs" ]; };
+  pinentry-gtk2 = pinentry.override { enabledFlavors = [ "gtk2" ]; };
+  pinentry-qt = pinentry.override { enabledFlavors = [ "qt" ]; };
+  pinentry-gnome3 = pinentry.override { enabledFlavors = [ "gnome3" ]; };
 
   pinentry_mac = callPackage ../tools/security/pinentry/mac.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa;