Unverified Commit 0c16e12d authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #238474 from SuperSandro2000/pcscd

 nixos/pcscd: suggest yubikey-personalization, fix restartTriggers
parents 5868a47d 74808f16
Loading
Loading
Loading
Loading
+1 −8
Original line number Diff line number Diff line
@@ -16,16 +16,13 @@ let

in
{

  ###### interface

  options.services.pcscd = {
    enable = mkEnableOption (lib.mdDoc "PCSC-Lite daemon");

    plugins = mkOption {
      type = types.listOf types.package;
      defaultText = literalExpression "[ pkgs.ccid ]";
      example = literalExpression "[ pkgs.pcsc-cyberjack ]";
      example = literalExpression "with pkgs; [ pcsc-cyberjack yubikey-personalization ]";
      description = lib.mdDoc "Plugin packages to be used for PCSC-Lite.";
    };

@@ -46,10 +43,7 @@ in
    };
  };

  ###### implementation

  config = mkIf config.services.pcscd.enable {

    environment.etc."reader.conf".source = cfgFile;

    environment.systemPackages = [ package ];
@@ -61,7 +55,6 @@ in

    systemd.services.pcscd = {
      environment.PCSCLITE_HP_DROPDIR = pluginEnv;
      restartTriggers = [ "/etc/reader.conf" ];

      # If the cfgFile is empty and not specified (in which case the default
      # /etc/reader.conf is assumed), pcscd will happily start going through the