ccid: migrate to pkgs/by-name, format with nixfmt-rfc-style

This commit is contained in:
Anthony ROUSSEL 2024-09-17 21:20:18 +02:00
parent b85b6425ff
commit e08704965a
2 changed files with 16 additions and 17 deletions

View File

@ -1,13 +1,14 @@
{ lib
, stdenv
, fetchurl
, flex
, pcsclite
, pkg-config
, libusb1
, perl
, zlib
, gitUpdater
{
lib,
stdenv,
fetchurl,
flex,
gitUpdater,
libusb1,
pcsclite,
perl,
pkg-config,
zlib,
}:
stdenv.mkDerivation rec {
@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
postPatch = ''
patchShebangs .
substituteInPlace src/Makefile.in --replace /bin/echo echo
substituteInPlace src/Makefile.in --replace-fail /bin/echo echo
'';
configureFlags = [
@ -39,25 +40,25 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
flex
pkg-config
perl
pkg-config
];
buildInputs = [
pcsclite
libusb1
pcsclite
zlib
];
postInstall = ''
install -Dm 0444 -t $out/lib/udev/rules.d src/92_pcscd_ccid.rules
substituteInPlace $out/lib/udev/rules.d/92_pcscd_ccid.rules \
--replace "/usr/sbin/pcscd" "${pcsclite}/bin/pcscd"
--replace-fail "/usr/sbin/pcscd" "${pcsclite}/bin/pcscd"
'';
# The resulting shared object ends up outside of the default paths which are
# usually getting stripped.
stripDebugList = ["pcsc"];
stripDebugList = [ "pcsc" ];
passthru.updateScript = gitUpdater {
url = "https://salsa.debian.org/rousseau/CCID.git";

View File

@ -6263,8 +6263,6 @@ with pkgs;
ccd2iso = callPackage ../tools/cd-dvd/ccd2iso { };
ccid = callPackage ../tools/security/ccid { };
ccrypt = callPackage ../tools/security/ccrypt { };
ccze = callPackage ../tools/misc/ccze { };