Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pythonPackages.pyscard: Fix build on Darwin #91717

Merged
merged 1 commit into from
Jul 7, 2020

Conversation

kevingriffin
Copy link
Contributor

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.

Motivation for this change

Fixes #91716

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

# 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 [ ./ignore-macos-bug.patch ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
patches = optionals withApplePCSC [ ./ignore-macos-bug.patch ];
patches = optionals withApplePCSC [
(fetchpatch {
url = "https://github.com/LudovicRousseau/pyscard/commit/945e9c4cd4036155691f6ce9706a84283206f2ef.patch";
sha256 = "19n8w1wzn85zywr6xf04d8nfg7sgzjyvxp1ccp3rgfr4mcc36plc";
})
];

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I made this change, removed the patch file, and squished it all into the original commit.

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.
@veprbl
Copy link
Member

veprbl commented Jul 7, 2020

@GrahamcOfBorg build python27Packages.pyscard
@GrahamcOfBorg build python37Packages.pyscard
@GrahamcOfBorg build python38Packages.pyscard

@jonringer jonringer merged commit 44fd570 into NixOS:master Jul 7, 2020
@kevingriffin kevingriffin deleted the pyscard-darwin-199-fix branch July 7, 2020 23:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

pythonPackages.pyscard: 1.9.9 Doesn't build on macOS Catalina
3 participants