From d599839060400762a67d2c01d15b102ffe75e703 Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 22 Mar 2024 04:35:41 +0000 Subject: [PATCH] gnupg: fix cross compilation when `npth` upgraded 1.6 -> 1.7, the `npth-config` binary it previously provided was removed, and functionality folded into `gpgrt-config`. see: --- pkgs/tools/security/gnupg/24.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/gnupg/24.nix b/pkgs/tools/security/gnupg/24.nix index cc3ae15e9a1c..721c99dc4de9 100644 --- a/pkgs/tools/security/gnupg/24.nix +++ b/pkgs/tools/security/gnupg/24.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { "--with-libgcrypt-prefix=${libgcrypt.dev}" "--with-libassuan-prefix=${libassuan.dev}" "--with-ksba-prefix=${libksba.dev}" - "--with-npth-prefix=${npth}" + "GPGRT_CONFIG=${lib.getDev libgpg-error}/bin/gpgrt-config" ] ++ lib.optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentry.binaryPath or "bin/pinentry"}" ++ lib.optional withTpm2Tss "--with-tss=intel"