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

pcsctools: use the local smartcard list #97440

Merged
merged 3 commits into from Apr 3, 2021
Merged

Conversation

peterhoeg
Copy link
Member

@peterhoeg peterhoeg commented Sep 8, 2020

Motivation for this change

Use the local file provided with pcsctools or alternatively look in /etc/pcsc.

There is some noise from nixpkgs-fmt, so it's easier to read like this

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.

Comment on lines 27 to 33
]
++ stdenv.lib.optionals stdenv.isLinux [
"--enable-ipcdir=/run/pcscd"
"--enable-polkit"
"--with-systemdsystemunitdir=${placeholder "bin"}/lib/systemd/system"
]
++ stdenv.lib.optional (!stdenv.isLinux)
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
]
++ stdenv.lib.optionals stdenv.isLinux [
"--enable-ipcdir=/run/pcscd"
"--enable-polkit"
"--with-systemdsystemunitdir=${placeholder "bin"}/lib/systemd/system"
]
++ stdenv.lib.optional (!stdenv.isLinux)
] ++ stdenv.lib.optionals stdenv.isLinux [
"--enable-ipcdir=/run/pcscd"
"--enable-polkit"
"--with-systemdsystemunitdir=${placeholder "bin"}/lib/systemd/system"
] ++ stdenv.lib.optional (!stdenv.isLinux)

Comment on lines 53 to 54
]
++ stdenv.lib.optionals stdenv.isLinux [ dbus polkit systemd ]
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
]
++ stdenv.lib.optionals stdenv.isLinux [ dbus polkit systemd ]
] ++ stdenv.lib.optionals stdenv.isLinux [ dbus polkit systemd ]

@SuperSandro2000
Copy link
Member

Can you please target staging?

@peterhoeg peterhoeg changed the base branch from master to staging November 24, 2020 04:00
@peterhoeg peterhoeg changed the title pcsctools: use the local smartcard list [WIP] pcsctools: use the local smartcard list Nov 24, 2020
@peterhoeg peterhoeg marked this pull request as ready for review November 24, 2020 04:00
Use the local file provided with pcsctools or alternatively look in /etc/pcsc.
Comment on lines 9 to 11
, polkit ? null
, systemd ? null
, IOKit ? null
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
, polkit ? null
, systemd ? null
, IOKit ? null
, polkit
, systemd
, IOKit

If we get any error here than we did something wrong and darwin will be broken because something is null.

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.

None yet

2 participants