From e204319c740020330cd657c352d7f29b3d432f5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 25 Nov 2020 00:37:52 +0100 Subject: [PATCH] pythonPackages.pyscard: Remove patch that is included in 1.9.9 and 2.0.0 --- .../python-modules/pyscard/default.nix | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index fefeaf7ebb55a..6007628d00dea 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -30,21 +30,6 @@ 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 ];