diff options
| author | Shea Levy <shea@shealevy.com> | 2014-03-28 23:45:00 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-03-28 23:45:00 -0400 |
| commit | 7cebcb995dc424e38af1514f6ba046b1f7697df5 (patch) | |
| tree | ac3e0bc9df7a7bfe303fea9f6d74c896694320d8 /nixos | |
| parent | 701cb6b099b2071535409c98cc1ccbacdeeb3247 (diff) | |
| parent | fff798b018d0d0087aaaef35e102fc15cd7788b5 (diff) | |
| download | nixpkgs-7cebcb995dc424e38af1514f6ba046b1f7697df5.tar nixpkgs-7cebcb995dc424e38af1514f6ba046b1f7697df5.tar.gz nixpkgs-7cebcb995dc424e38af1514f6ba046b1f7697df5.tar.bz2 nixpkgs-7cebcb995dc424e38af1514f6ba046b1f7697df5.tar.lz nixpkgs-7cebcb995dc424e38af1514f6ba046b1f7697df5.tar.xz nixpkgs-7cebcb995dc424e38af1514f6ba046b1f7697df5.tar.zst nixpkgs-7cebcb995dc424e38af1514f6ba046b1f7697df5.zip | |
Merge branch 'cache.pcscd' of git://github.com/wkennington/nixpkgs
Update Smartcard Utils + Fix Daemon Expression
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/hardware/pcscd.nix | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/nixos/modules/services/hardware/pcscd.nix b/nixos/modules/services/hardware/pcscd.nix index 9f389efc06d..6d429c94b28 100644 --- a/nixos/modules/services/hardware/pcscd.nix +++ b/nixos/modules/services/hardware/pcscd.nix @@ -1,5 +1,9 @@ { config, pkgs, ... }: +let + cfgFile = pkgs.writeText "reader.conf" ""; +in + with pkgs.lib; { @@ -24,22 +28,19 @@ with pkgs.lib; config = mkIf config.services.pcscd.enable { - jobs.pcscd = - { description = "PCSC-Lite daemon"; - - startOn = "started udev"; - - daemonType = "fork"; - - # Add to the drivers directory the only drivers we have by now: ccid - preStart = '' - mkdir -p /var/lib/pcsc - rm -Rf /var/lib/pcsc/drivers - ln -s ${pkgs.ccid}/pcsc/drivers /var/lib/pcsc/ - ''; - - exec = "${pkgs.pcsclite}/sbin/pcscd"; + systemd.services.pcscd = { + description = "PCSC-Lite daemon"; + wantedBy = [ "multi-user.target" ]; + preStart = '' + mkdir -p /var/lib/pcsc + rm -Rf /var/lib/pcsc/drivers + ln -s ${pkgs.ccid}/pcsc/drivers /var/lib/pcsc/ + ''; + serviceConfig = { + Type = "forking"; + ExecStart = "${pkgs.pcsclite}/sbin/pcscd -c ${cfgFile}"; }; + }; }; |