public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cache.pcscd' of git://github.com/wkennington/nixpkgs

Browse Source 
Update Smartcard Utils + Fix Daemon Expression
This commit is contained in:
Shea Levy 2014-03-28 23:45:00 -04:00
commit 7cebcb995d
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
nixos/modules/services/hardware/pcscd.nix
View File

@ -1,5 +1,9 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let
cfgFile = pkgs.writeText "reader.conf" "";
in
with pkgs.lib; with pkgs.lib;
{ {
@ -24,22 +28,19 @@ with pkgs.lib;
config = mkIf config.services.pcscd.enable { config = mkIf config.services.pcscd.enable {
jobs.pcscd = systemd.services.pcscd = {
{ description = "PCSC-Lite daemon"; description = "PCSC-Lite daemon";
wantedBy = [ "multi-user.target" ];
startOn = "started udev"; preStart = ''
mkdir -p /var/lib/pcsc
daemonType = "fork"; rm -Rf /var/lib/pcsc/drivers
ln -s ${pkgs.ccid}/pcsc/drivers /var/lib/pcsc/
# Add to the drivers directory the only drivers we have by now: ccid '';
preStart = '' serviceConfig = {
mkdir -p /var/lib/pcsc Type = "forking";
rm -Rf /var/lib/pcsc/drivers ExecStart = "${pkgs.pcsclite}/sbin/pcscd -c ${cfgFile}";
ln -s ${pkgs.ccid}/pcsc/drivers /var/lib/pcsc/
'';
exec = "${pkgs.pcsclite}/sbin/pcscd";
}; };
};
}; };

14
pkgs/tools/security/pcsclite/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl }: { stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.8.10"; version = "1.8.11";
name = "pcsclite-${version}"; name = "pcsclite-${version}";
src = fetchurl { src = fetchurl {
url = "https://alioth.debian.org/frs/download.php/file/3963/pcsc-lite-${version}.tar.bz2"; url = "https://alioth.debian.org/frs/download.php/file/3991/pcsc-lite-${version}.tar.bz2";
sha256 = "04i63zi9ayg38z3cahp6gf3rgx23w17bmcpdccm2hvaj63blnz30"; sha256 = "945041c94c53959ae5a767616a4ec5099fe67f549bfd344e8bd0cfe7a3c71ac6";
}; };
# The OS should care on preparing the drivers into this location # The OS should care on preparing the drivers into this location
@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
meta = { meta = with stdenv.lib; {
description = "Middleware to access a smart card using SCard API (PC/SC)"; description = "Middleware to access a smart card using SCard API (PC/SC)";
homepage = http://pcsclite.alioth.debian.org/; homepage = http://pcsclite.alioth.debian.org/;
license = "BSD"; license = licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [viric]; maintainers = with maintainers; [viric];
platforms = with stdenv.lib.platforms; linux; platforms = with platforms; linux;
}; };
} }