pyscard: fix darwin build, remove pcsc library mixing #65163
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This should be built against a single version of PCSC: either the one from pcsclite, or the one from Apple's PCSC framework.
thefloweringash
force-pushed
the
pyscard-darwin
branch
from
006cb09
to
59e9e56
Compare
thefloweringash
commented
Jul 20, 2019
| postPatch = if withApplePCSC then '' | ||
| substituteInPlace smartcard/scard/winscarddll.c \ | ||
| --replace "/System/Library/Frameworks/PCSC.framework/PCSC" \ | ||
| "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" |
There was a problem hiding this comment.
I'm not familiar with the details of Apple SDK wrappers. This latter appears to be symlink to the former, is there any point to this?
There was a problem hiding this comment.
If we ever get sandboxing enabled by default, it will be necessary to have the latter to ensure that Nix includes the correct framework.
marsam
approved these changes
Aug 29, 2019
|
Closes #65345 |
10 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This should be built against a single version of PCSC: either the one
from pcsclite, or the one from Apple's PCSC framework.
Motivation for this change
Fix failing Darwin build. I didn't find the exact cause, but eliminating the library mixing seems sufficient.
Tested with python2 and python3 on macOS and Linux with an "OMNIKEY CardMan 1021" talking to Aventra myEIDs.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)