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
base: 6673a4988e4a
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: c88f04cb9325
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 21, 2020

  1. pgpgme: Fix build with python on macOS 

    * Replace LD_LIBRARY_PATH with OS-specific name (e.g. DYLD_LIBRARY_PATH
  on macOS).
* Disable Python tests on macOS, because they use gpg, which fails due
  to a very long socket path (NixOS/nix#1085).

The former should be fixed upstream. The latter is a Nix-specific issue,
but it can be worked-around upstream by making Python tests respect
--disable-gpg-test.
    @kirelagin @FRidh
    kirelagin authored and FRidh committed Apr 21, 2020
    Copy the full SHA
    5470d96 View commit details
    Browse the repository at this point in the history

  2. gpgme: convert macos sed patch scripts to patch files 

    This is less brittle and breaks loud if the code changes.
Also remove the /usr/bin/file patch. It is not really required
for the build to work, the generated warning is harmless.
    @Mic92 @FRidh
    Mic92 authored and FRidh committed Apr 21, 2020
    Copy the full SHA
    c88f04c View commit details
    Browse the repository at this point in the history