Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2ef3b5200a41
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b0053ae92e5b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 7, 2019

  1. gpgme: disable tests on darwin

    @veprbl
    veprbl committed Jun 7, 2019
    Copy the full SHA
    f19a36f View commit details

  2. Merge pull request #62836 from veprbl/pr/gpgme_darwin_fix 

    gpgme: disable tests on darwin
    @matthewbauer
    matthewbauer authored Jun 7, 2019
    Copy the full SHA
    b0053ae View commit details
Showing with 6 additions and 1 deletion.
  1. +6 −1 pkgs/development/libraries/gpgme/default.nix
7 changes: 6 additions & 1 deletion pkgs/development/libraries/gpgme/default.nix
View file
Original file line number Diff line number Diff line change
@@ -40,7 +40,12 @@ stdenv.mkDerivation rec {
"--enable-fixed-path=${gnupg}/bin"
"--with-libgpg-error-prefix=${libgpgerror.dev}"
"--with-libassuan-prefix=${libassuan.dev}"
] ++ lib.optional pythonSupport "--enable-languages=python";
] ++ lib.optional pythonSupport "--enable-languages=python"
# Tests will try to communicate with gpg-agent instance via a UNIX socket
# which has a path length limit. Nix on darwin is using a build directory
# that already has quite a long path and the resulting socket path doesn't
# fit in the limit. https://github.com/NixOS/nix/pull/1085
++ lib.optionals stdenv.isDarwin [ "--disable-gpg-test" ];

NIX_CFLAGS_COMPILE =
# qgpgme uses Q_ASSERT which retains build inputs at runtime unless