From b99dfb1cc792d1c7a4f1cefe2ff4a753ae3e2110 Mon Sep 17 00:00:00 2001 From: Tomo Date: Mon, 14 Oct 2024 07:20:08 +0000 Subject: [PATCH] pinentry: remove qt5.mkDerivation usage Part of #180841 wrapQtAppsHook appears to already have been added when building this for qt5, thanks to flavorInfo. --- pkgs/tools/security/pinentry/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index faf96b7263b4..7392d39a52f1 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -62,11 +62,8 @@ let let enableFeaturePinentry = f: lib.enableFeature (lib.elem f buildFlavors) ("pinentry-" + flavorInfo.${f}.flag); - - pinentryMkDerivation = - if (lib.elem "qt5" buildFlavors) then libsForQt5.mkDerivation else stdenv.mkDerivation; in - pinentryMkDerivation rec { + stdenv.mkDerivation rec { pname = "pinentry-${pinentryExtraPname}"; version = "1.3.1";