From b3c17c9d85339a545e5a0a02fb5e149ec62fc40f Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 6 Apr 2019 15:55:09 +0200 Subject: [PATCH] pinentry: fix libassuan and libgpg-error detection in cross builds --- pkgs/tools/security/pinentry/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 705338634f11..87df0ffd834d 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0w35ypl960pczg5kp6km3dyr000m1hf0vpwwlh72jjkjza36c1v8"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libgpgerror libassuan libcap libsecret gtk2 gcr ncurses qt ]; prePatch = '' @@ -33,9 +34,10 @@ stdenv.mkDerivation rec { (stdenv.lib.enableFeature (gtk2 != null) "pinentry-gtk2") (stdenv.lib.enableFeature (gcr != null) "pinentry-gnome3") (stdenv.lib.enableFeature (qt != null) "pinentry-qt") - ]; - nativeBuildInputs = [ pkgconfig ]; + "--with-libassuan-prefix=${libassuan.dev}" + "--with-libgpg-error-prefix=${libgpgerror.dev}" + ]; meta = with stdenv.lib; { homepage = http://gnupg.org/aegypten2/;