summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2019-03-22 12:57:33 +0100
committerGitHub <noreply@github.com>2019-03-22 12:57:33 +0100
commit69e23dcc666fea13b04307bc44972aa05d4b2821 (patch)
treee48132fb08ec2b8282878ec81a693d527654a2c8 /pkgs/development
parent34bc84d5b855c419cebed856b6fb0fa9a0ef98bc (diff)
parentaefea5f0bde9fb9282eb51a629f638e93283d095 (diff)
downloadnixpkgs-69e23dcc666fea13b04307bc44972aa05d4b2821.tar
nixpkgs-69e23dcc666fea13b04307bc44972aa05d4b2821.tar.gz
nixpkgs-69e23dcc666fea13b04307bc44972aa05d4b2821.tar.bz2
nixpkgs-69e23dcc666fea13b04307bc44972aa05d4b2821.tar.lz
nixpkgs-69e23dcc666fea13b04307bc44972aa05d4b2821.tar.xz
nixpkgs-69e23dcc666fea13b04307bc44972aa05d4b2821.tar.zst
nixpkgs-69e23dcc666fea13b04307bc44972aa05d4b2821.zip
Merge pull request #58046 from illegalprime/gpgme-cross
gpgme: cross compilation
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/gpgme/default.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index fc98af8b2ca..ed2c3e6b800 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -3,6 +3,7 @@
 , autoreconfHook, fetchpatch
 , git
 , texinfo
+, buildPackages
 , qtbase ? null
 , pythonSupport ? false, swig2 ? null, python ? null
 }:
@@ -31,6 +32,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo ]
   ++ lib.optionals pythonSupport [ python swig2 which ncurses ];
 
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+
   patches = [
     (fetchpatch {
       name = "fix-key-expiry.patch";
@@ -46,6 +49,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-fixed-path=${gnupg}/bin"
     "--with-libgpg-error-prefix=${libgpgerror.dev}"
+    "--with-libassuan-prefix=${libassuan.dev}"
   ] ++ lib.optional pythonSupport "--enable-languages=python";
 
   NIX_CFLAGS_COMPILE =