Skip to content

Commit 1519ec7

Browse files
author
Adam Joseph
committed
gpgme: on Darwin, disable only the gpg-test, not the others
1 parent 01c9206 commit 1519ec7

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

pkgs/development/libraries/gpgme/default.nix

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,12 @@ stdenv.mkDerivation rec {
9595
"--enable-fixed-path=${gnupg}/bin"
9696
"--with-libgpg-error-prefix=${libgpg-error.dev}"
9797
"--with-libassuan-prefix=${libassuan.dev}"
98-
] ++ lib.optional pythonSupport "--enable-languages=python";
98+
] ++ lib.optional pythonSupport "--enable-languages=python"
99+
# Tests will try to communicate with gpg-agent instance via a UNIX socket
100+
# which has a path length limit. Nix on darwin is using a build directory
101+
# that already has quite a long path and the resulting socket path doesn't
102+
# fit in the limit. https://github.com/NixOS/nix/pull/1085
103+
++ lib.optionals stdenv.isDarwin [ "--disable-gpg-test" ];
99104

100105
NIX_CFLAGS_COMPILE = toString (
101106
# qgpgme uses Q_ASSERT which retains build inputs at runtime unless
@@ -108,11 +113,7 @@ stdenv.mkDerivation rec {
108113
# prevent tests from being run during the buildPhase
109114
makeFlags = [ "tests=" ];
110115

111-
# Tests will try to communicate with gpg-agent instance via a UNIX socket
112-
# which has a path length limit. Nix on darwin is using a build directory
113-
# that already has quite a long path and the resulting socket path doesn't
114-
# fit in the limit. https://github.com/NixOS/nix/pull/1085
115-
doCheck = !stdenv.isDarwin;
116+
doCheck = true;
116117

117118
checkFlags = [ "-C" "tests" ];
118119

0 commit comments

Comments
 (0)