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

Merge pull request #272754 from anthonyroussel/perl-ChipcardPCSC

Browse Source 
perlPackages.ChipcardPCSC: 1.4.14 -> 1.4.16
This commit is contained in:
Stig 2023-12-09 00:40:24 +01:00 committed by GitHub
commit 13849335b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/security/pcsctools/default.nix
View File

@ -36,11 +36,11 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/scriptor \
--set PERL5LIB "${with perlPackages; makePerlPath [ pcscperl ]}"
--set PERL5LIB "${with perlPackages; makePerlPath [ ChipcardPCSC ]}"
wrapProgram $out/bin/gscriptor \
--set PERL5LIB "${with perlPackages; makePerlPath [ pcscperl GlibObjectIntrospection Glib Gtk3 Pango Cairo CairoGObject ]}"
--set PERL5LIB "${with perlPackages; makePerlPath [ ChipcardPCSC GlibObjectIntrospection Glib Gtk3 Pango Cairo CairoGObject ]}"
wrapProgram $out/bin/ATR_analysis \
--set PERL5LIB "${with perlPackages; makePerlPath [ pcscperl ]}"
--set PERL5LIB "${with perlPackages; makePerlPath [ ChipcardPCSC ]}"
wrapProgram $out/bin/pcsc_scan \
--prefix PATH : "$out/bin:${lib.makeBinPath [ coreutils wget ]}"

48
pkgs/top-level/perl-packages.nix
View File

@ -3296,6 +3296,32 @@ with self; {
};
};
ChipcardPCSC = buildPerlPackage {
pname = "Chipcard-PCSC";
version = "1.4.16";
src = fetchurl {
url = "mirror://cpan/authors/id/W/WH/WHOM/Chipcard-PCSC-v1.4.16.tar.gz";
hash = "sha256-O14p1jRDXxQm7Nzfebo1G04mWPNsPCK+N7HTHjbKj6k=";
};
buildInputs = [ pkgs.pcsclite ];
nativeBuildInputs = [ pkgs.pkg-config ];
env.NIX_CFLAGS_COMPILE = toString ([
"-I${pkgs.pcsclite.dev}/include/PCSC"
] ++ lib.optionals stdenv.cc.isClang [
"-Wno-error=implicit-int"
"-Wno-error=int-conversion"
]);
NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.pcsclite}/lib -lpcsclite";
# tests fail; look unfinished
doCheck = false;
meta = {
description = "Communicate with a smart card using PC/SC";
homepage = "https://pcsc-perl.apdu.fr/";
license = with lib.licenses; [ gpl2Plus ];
maintainers = with maintainers; [ abbradar anthonyroussel ];
};
};
CiscoIPPhone = buildPerlPackage {
pname = "Cisco-IPPhone";
version = "0.05";
@ -20198,27 +20224,6 @@ with self; {
};
};
pcscperl = buildPerlPackage {
pname = "pcsc-perl";
version = "1.4.14";
src = fetchurl {
url = "mirror://cpan/authors/id/W/WH/WHOM/pcsc-perl-1.4.14.tar.bz2";
hash = "sha256-JyK35VQ+T687oexrKaff7G2Svh7ewJ0KMZGZLU2Ixp0=";
};
buildInputs = [ pkgs.pcsclite ];
nativeBuildInputs = [ pkgs.pkg-config ];
NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.pcsclite}/lib -lpcsclite";
# tests fail; look unfinished
doCheck = false;
meta = {
description = "Communicate with a smart card using PC/SC";
homepage = "http://ludovic.rousseau.free.fr/softwares/pcsc-perl/";
license = with lib.licenses; [ gpl2Plus ];
maintainers = with maintainers; [ abbradar ];
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.pcscperl.x86_64-darwin
};
};
PDFAPI2 = buildPerlPackage {
pname = "PDF-API2";
version = "2.045";
@ -29327,4 +29332,5 @@ with self; {
version = self.Version;
Gtk2GladeXML = throw "Gtk2GladeXML has been removed"; # 2022-01-15
pcscperl = throw "'pcscperl' has been renamed to 'ChipcardPCSC'"; # Added 2023-12-07
}