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

pyscard: fix darwin build, remove pcsc library mixing #65163

Merged
merged 1 commit into from Sep 3, 2019

Conversation

@thefloweringash
Copy link
Member

thefloweringash commented Jul 20, 2019

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
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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.

@thefloweringash thefloweringash requested a review from FRidh as a code owner Jul 20, 2019
This should be built against a single version of PCSC: either the one
from pcsclite, or the one from Apple's PCSC framework.
@thefloweringash thefloweringash force-pushed the thefloweringash:pyscard-darwin branch from 006cb09 to 59e9e56 Jul 20, 2019
@ofborg ofborg bot added the 6.topic: darwin label 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"

This comment has been minimized.

Copy link
@thefloweringash

thefloweringash Jul 20, 2019

Author Member

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?

This comment has been minimized.

Copy link
@matthewbauer

matthewbauer Aug 14, 2019

Member

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
marsam approved these changes Aug 29, 2019
@marsam

This comment has been minimized.

Copy link
Contributor

marsam commented Aug 29, 2019

Closes #65345

@marsam marsam mentioned this pull request Aug 29, 2019
3 of 10 tasks complete
@marsam marsam merged commit 1bf5120 into NixOS:master Sep 3, 2019
13 checks passed
13 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@thefloweringash thefloweringash deleted the thefloweringash:pyscard-darwin branch Sep 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.