Skip to content

Commit

Permalink
pythonPackages.pyscard: Fix build on Darwin
Browse files Browse the repository at this point in the history
The previously provided patch is still necessary,
as nix python reports an old version of macOS
that has the bug, when in fact modern macOS
does not have the misspelling.

The patch has been upstreamed, so we take it
to fix 1.9.9 in anticipation of the next release.
  • Loading branch information
kevingriffin authored and Jon committed Jul 7, 2020
1 parent 51a36a4 commit 44fd570
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 23 deletions.
17 changes: 16 additions & 1 deletion pkgs/development/python-modules/pyscard/default.nix
@@ -1,4 +1,4 @@
{ stdenv, fetchPypi, buildPythonPackage, swig, pcsclite, PCSC }:
{ stdenv, fetchPypi, fetchpatch, buildPythonPackage, swig, pcsclite, PCSC }:

let
# Package does not support configuring the pcsc library.
Expand Down Expand Up @@ -30,6 +30,21 @@ buildPythonPackage rec {
NIX_CFLAGS_COMPILE = optionalString (! withApplePCSC)
"-I ${getDev pcsclite}/include/PCSC";

# The error message differs depending on the macOS host version.
# Since Nix reports a constant host version, but proxies to the
# underlying library, it's not possible to determine the correct
# expected error message. This patch allows both errors to be
# accepted.
# See: https://github.com/LudovicRousseau/pyscard/issues/77
# Building with python from nix on macOS version 10.13 or
# greater still causes this issue to occur.
patches = optionals withApplePCSC [
(fetchpatch {
url = "https://github.com/LudovicRousseau/pyscard/commit/945e9c4cd4036155691f6ce9706a84283206f2ef.patch";
sha256 = "19n8w1wzn85zywr6xf04d8nfg7sgzjyvxp1ccp3rgfr4mcc36plc";
})
];

propagatedBuildInputs = if withApplePCSC then [ PCSC ] else [ pcsclite ];
nativeBuildInputs = [ swig ];

Expand Down
22 changes: 0 additions & 22 deletions pkgs/development/python-modules/pyscard/ignore-macos-bug.patch

This file was deleted.

0 comments on commit 44fd570

Please sign in to comment.