mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 00:43:20 +00:00
pinentry: remove qt5.mkDerivation usage
Part of #180841 wrapQtAppsHook appears to already have been added when building this for qt5, thanks to flavorInfo.
This commit is contained in:
parent
a3c0b3b215
commit
b99dfb1cc7
@ -62,11 +62,8 @@ let
|
|||||||
let
|
let
|
||||||
enableFeaturePinentry =
|
enableFeaturePinentry =
|
||||||
f: lib.enableFeature (lib.elem f buildFlavors) ("pinentry-" + flavorInfo.${f}.flag);
|
f: lib.enableFeature (lib.elem f buildFlavors) ("pinentry-" + flavorInfo.${f}.flag);
|
||||||
|
|
||||||
pinentryMkDerivation =
|
|
||||||
if (lib.elem "qt5" buildFlavors) then libsForQt5.mkDerivation else stdenv.mkDerivation;
|
|
||||||
in
|
in
|
||||||
pinentryMkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "pinentry-${pinentryExtraPname}";
|
pname = "pinentry-${pinentryExtraPname}";
|
||||||
version = "1.3.1";
|
version = "1.3.1";
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user