Skip to content

Commit 64bf283

Browse files
committedSep 17, 2017
opensc: add darwin frameworks
1 parent 1493074 commit 64bf283

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed
 

Diff for: ‎pkgs/tools/security/opensc/default.nix

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zlib, readline, openssl
22
, libiconv, pcsclite, libassuan, libXt
33
, docbook_xsl, libxslt, docbook_xml_dtd_412
4+
, Carbon
45
}:
56

67
stdenv.mkDerivation rec {
@@ -17,7 +18,7 @@ stdenv.mkDerivation rec {
1718
buildInputs = [
1819
autoreconfHook pkgconfig zlib readline openssl pcsclite libassuan
1920
libXt libxslt libiconv docbook_xml_dtd_412
20-
];
21+
] ++ stdenv.lib.optional stdenv.isDarwin Carbon;
2122

2223
configureFlags = [
2324
"--enable-zlib"
@@ -37,8 +38,6 @@ stdenv.mkDerivation rec {
3738
"sysconfdir=$(out)/etc"
3839
];
3940

40-
41-
4241
meta = with stdenv.lib; {
4342
description = "Set of libraries and utilities to access smart cards";
4443
homepage = https://github.com/OpenSC/OpenSC/wiki;

Diff for: ‎pkgs/top-level/all-packages.nix

+3-1
Original file line numberDiff line numberDiff line change
@@ -3634,7 +3634,9 @@ with pkgs;
36343634

36353635
openresolv = callPackage ../tools/networking/openresolv { };
36363636

3637-
opensc = callPackage ../tools/security/opensc { };
3637+
opensc = callPackage ../tools/security/opensc {
3638+
inherit (darwin.apple_sdk.frameworks) Carbon;
3639+
};
36383640

36393641
openssh =
36403642
callPackage ../tools/networking/openssh {

0 commit comments

Comments
 (0)