summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2023-02-02 12:03:20 +0000
committerAlyssa Ross <hi@alyssa.is>2023-02-02 12:03:20 +0000
commit14d9512d60fc759fa9295cee33e03c03af85f1cf (patch)
tree9a6be951cd091be5995bd0b864f26dfd7d3b9393
parentfffb187b8ebea382b02a70d20dee945fbadd3359 (diff)
downloadnixpkgs-14d9512d60fc759fa9295cee33e03c03af85f1cf.tar
nixpkgs-14d9512d60fc759fa9295cee33e03c03af85f1cf.tar.gz
nixpkgs-14d9512d60fc759fa9295cee33e03c03af85f1cf.tar.bz2
nixpkgs-14d9512d60fc759fa9295cee33e03c03af85f1cf.tar.lz
nixpkgs-14d9512d60fc759fa9295cee33e03c03af85f1cf.tar.xz
nixpkgs-14d9512d60fc759fa9295cee33e03c03af85f1cf.tar.zst
nixpkgs-14d9512d60fc759fa9295cee33e03c03af85f1cf.zip
Revert "libassuan: Use automatically detected libgpg-error"
This reverts commit 2d44dc9643c28346ea5b22561869d04a62a80be0.

Cross-compilation only works if we set --with-libgpg-error-prefix,
which is why that flag was there in the first place[1].  Unfortunately
this was not noted in the commit message that added it, which made it
difficult to discover…

[1]: https://github.com/NixOS/nixpkgs/pull/57815
-rw-r--r--pkgs/development/libraries/libassuan/default.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix
index 97f4548cb38..3a00ca498cb 100644
--- a/pkgs/development/libraries/libassuan/default.nix
+++ b/pkgs/development/libraries/libassuan/default.nix
@@ -13,7 +13,11 @@ stdenv.mkDerivation rec {
   outputBin = "dev"; # libassuan-config
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
-  buildInputs = [ npth gettext libgpg-error ];
+  buildInputs = [ npth gettext ];
+
+  configureFlags = [
+    "--with-libgpg-error-prefix=${libgpg-error.dev}"
+  ];
 
   doCheck = true;