From 64bf283104fae7a73c4891956a009851bfa38979 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 17 Sep 2017 16:08:13 +0200 Subject: opensc: add darwin frameworks --- pkgs/tools/security/opensc/default.nix | 5 ++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 302a5e251b03..2b606d505bdc 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zlib, readline, openssl , libiconv, pcsclite, libassuan, libXt , docbook_xsl, libxslt, docbook_xml_dtd_412 +, Carbon }: stdenv.mkDerivation rec { @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoreconfHook pkgconfig zlib readline openssl pcsclite libassuan libXt libxslt libiconv docbook_xml_dtd_412 - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin Carbon; configureFlags = [ "--enable-zlib" @@ -37,8 +38,6 @@ stdenv.mkDerivation rec { "sysconfdir=$(out)/etc" ]; - - meta = with stdenv.lib; { description = "Set of libraries and utilities to access smart cards"; homepage = https://github.com/OpenSC/OpenSC/wiki; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31c212a332d5..6163482cd403 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3634,7 +3634,9 @@ with pkgs; openresolv = callPackage ../tools/networking/openresolv { }; - opensc = callPackage ../tools/security/opensc { }; + opensc = callPackage ../tools/security/opensc { + inherit (darwin.apple_sdk.frameworks) Carbon; + }; openssh = callPackage ../tools/networking/openssh { -- cgit 1.4.1