git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #60852 from thefloweringash/opensc-darwin

opensc: use built-in PCSC provider on darwin

commit11fe4f3be003f9679b56aae3754c9039cb5fe0b6 authorRenaud <c0bw3b@users.noreply.github.com> dateFri 10 May 2019, 18:46 (8 years ago) parent4b7aea94ad50e2
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 NIX_CFLAGS_COMPILE = "-Wno-error";
2528
@@ -34,9 +37,17 @@ stdenv.mkDerivation rec {
3437 "--localstatedir=/var"
3538 "--sysconfdir=/etc"
3639 "--with-xsl-stylesheetsdir=${docbook_xsl}/xml/xsl/docbook"
37− "--with-pcsc-provider=${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so"
40+ "--with-pcsc-provider=${
41+ if withApplePCSC then
42+ "${PCSC}/Library/Frameworks/PCSC.framework/PCSC"
43+ else
44+ "${stdenv.lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}"
45+ }"
3846 ];
3947
48+ PCSC_CFLAGS = stdenv.lib.optionalString withApplePCSC
49+ "-I${PCSC}/Library/Frameworks/PCSC.framework/Headers";
50+
4051 installFlags = [
4152 "sysconfdir=$(out)/etc"
4253 "completiondir=$(out)/etc"
pkgs/top-level/all-packages.nix+1−1
@@ -4898,7 +4898,7 @@ in
48984898 openresolv = callPackage ../tools/networking/openresolv { };
48994899
49004900 opensc = callPackage ../tools/security/opensc {
4901− inherit (darwin.apple_sdk.frameworks) Carbon;
4901+ inherit (darwin.apple_sdk.frameworks) Carbon PCSC;
49024902 };
49034903
49044904 opensm = callPackage ../tools/networking/opensm { };