git.iko.soy/typeable/nixpkgs
on master help sign in
opensc: use built-in PCSC provider on darwin
commit4ad50e2cdce29d1b01004c005ed9966db2ea1dde authorAndrew Childs <lorne@cons.org.nz> dateFri 3 May 2019, 17:08 (8 years ago) parent9dd83eb
2 files changed+16−5
pkgs/tools/security/opensc/default.nix+15−4 pkgs/top-level/all-packages.nix+1−1
pkgs/tools/security/opensc/default.nix+15−4
@@ -1,7 +1,8 @@
11{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zlib, readline, openssl
22, libiconv, pcsclite, libassuan, libXt
33, docbook_xsl, libxslt, docbook_xml_dtd_412
4−, Carbon
4+, Carbon, PCSC
5+, withApplePCSC ? stdenv.isDarwin
56}:
67
78stdenv.mkDerivation rec {
@@ -17,9 +18,11 @@ stdenv.mkDerivation rec {
1718
1819 nativeBuildInputs = [ pkgconfig ];
1920 buildInputs = [
20− autoreconfHook zlib readline openssl pcsclite libassuan
21+ autoreconfHook zlib readline openssl libassuan
2122 libXt libxslt libiconv docbook_xml_dtd_412
22− ] ++ stdenv.lib.optional stdenv.isDarwin Carbon;
23+ ]
24+ ++ stdenv.lib.optional stdenv.isDarwin Carbon
25+ ++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]);
2326
2427 configureFlags = [
2528 "--enable-zlib"
@@ -32,9 +35,17 @@ stdenv.mkDerivation rec {
3235 "--localstatedir=/var"
3336 "--sysconfdir=/etc"
3437 "--with-xsl-stylesheetsdir=${docbook_xsl}/xml/xsl/docbook"
35− "--with-pcsc-provider=${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so"
38+ "--with-pcsc-provider=${
39+ if withApplePCSC then
40+ "${PCSC}/Library/Frameworks/PCSC.framework/PCSC"
41+ else
42+ "${stdenv.lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}"
43+ }"
3644 ];
3745
46+ PCSC_CFLAGS = stdenv.lib.optionalString withApplePCSC
47+ "-I${PCSC}/Library/Frameworks/PCSC.framework/Headers";
48+
3849 installFlags = [
3950 "sysconfdir=$(out)/etc"
4051 "completiondir=$(out)/etc"
pkgs/top-level/all-packages.nix+1−1
@@ -4859,7 +4859,7 @@ in
48594859 openresolv = callPackage ../tools/networking/openresolv { };
48604860
48614861 opensc = callPackage ../tools/security/opensc {
4862− inherit (darwin.apple_sdk.frameworks) Carbon;
4862+ inherit (darwin.apple_sdk.frameworks) Carbon PCSC;
48634863 };
48644864
48654865 opensm = callPackage ../tools/networking/opensm { };