about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2019-04-06 15:55:09 +0200
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2019-04-16 18:58:47 +0200
commitb3c17c9d85339a545e5a0a02fb5e149ec62fc40f (patch)
tree6428720e14859252199d45d962616b104ea992ad
parentbcbbbf97b37329015bc72c5cbc0df37a0acda907 (diff)
downloadnixlib-b3c17c9d85339a545e5a0a02fb5e149ec62fc40f.tar
nixlib-b3c17c9d85339a545e5a0a02fb5e149ec62fc40f.tar.gz
nixlib-b3c17c9d85339a545e5a0a02fb5e149ec62fc40f.tar.bz2
nixlib-b3c17c9d85339a545e5a0a02fb5e149ec62fc40f.tar.lz
nixlib-b3c17c9d85339a545e5a0a02fb5e149ec62fc40f.tar.xz
nixlib-b3c17c9d85339a545e5a0a02fb5e149ec62fc40f.tar.zst
nixlib-b3c17c9d85339a545e5a0a02fb5e149ec62fc40f.zip
pinentry: fix libassuan and libgpg-error detection in cross builds
-rw-r--r--pkgs/tools/security/pinentry/default.nix6
1 files 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/;