From a880b5065d1e30398ffc28c38db250e62c02298d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 29 Dec 2023 04:24:17 +0100
Subject: [PATCH] pinentry-*: build dependent variant with an override instead
 of choosing the output

We don't want to depend on the *enabled* flavors of pinentry but on all
*possible* ones.
---
 nixos/modules/programs/gnupg.nix         |  2 +-
 pkgs/tools/security/pinentry/default.nix |  5 ++++-
 pkgs/top-level/all-packages.nix          | 10 +++++-----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix
index 7afebd9df52f137..c4f497c86ec57e2 100644
--- a/nixos/modules/programs/gnupg.nix
+++ b/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'';
diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix
index dca48f4e21087f3..11d245374f9a7a5 100644
--- a/pkgs/tools/security/pinentry/default.nix
+++ b/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/";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dadc9464cea43d0..c65328baba508fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/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;