From 0665c8776a5328f6cfe67ee554452dde5f4f9385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Wed, 6 May 2020 16:58:58 +0200 Subject: [PATCH] gnutls: fix musl build `musl` produces a different output than `glibc` during some tests, which let's them fail. Using `getpass(3)` under `musl` when `stdin` is not a tty omits the prompt, which the `certtool` test expects to find. See https://gitlab.com/gnutls/gnutls/-/issues/945 --- pkgs/development/libraries/gnutls/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index cffd5459b3a6..257e56cc18ff 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -48,6 +48,8 @@ stdenv.mkDerivation { sed '2iexit 77' -i tests/{pkgconfig,fastopen}.sh sed '/^void doit(void)/,/^{/ s/{/{ exit(77);/' -i tests/{trust-store,psk-file}.c sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh + '' + lib.optionalString stdenv.hostPlatform.isMusl '' # See https://gitlab.com/gnutls/gnutls/-/issues/945 + sed '2iecho "certtool tests skipped in musl build"\nexit 0' -i tests/cert-tests/certtool ''; preConfigure = "patchShebangs .";