Unverified Commit 7ca900f2 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

opensc: 0.25.1 -> 0.26.0 (#345666)

parents da355b10 2c2e671e

pkgs/tools/security/opensc/default.nix→pkgs/by-name/op/opensc/package.nix

+92 −0
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, zlib, readline, openssl

, libiconv, pcsclite, libassuan, libXt

, docbook_xsl, libxslt, docbook_xml_dtd_412

, Carbon, PCSC, buildPackages

, withApplePCSC ? stdenv.hostPlatform.isDarwin

{

  lib,

  stdenv,

  fetchFromGitHub,

  autoreconfHook,

  pkg-config,

  zlib,

  readline,

  openssl,

  libiconv,

  pcsclite,

  libassuan,

  libXt,

  docbook_xsl,

  libxslt,

  docbook_xml_dtd_412,

  darwin,

  buildPackages,

  nix-update-script,

  withApplePCSC ? stdenv.hostPlatform.isDarwin,

}:



stdenv.mkDerivation rec {

  pname = "opensc";

  version = "0.25.1";

  version = "0.26.0";



  src = fetchFromGitHub {

    owner = "OpenSC";

    repo = "OpenSC";

    rev = version;

    sha256 = "sha256-Ktvp/9Hca87qWmDlQhFzvWsr7TvNpIAvOFS+4zTZbB8=";

    sha256 = "sha256-EIQ9YpIGwckg/JjpK0S2ZYdFf/0YC4KaWcLXRNRMuzA=";

  };



  nativeBuildInputs = [ pkg-config autoreconfHook ];

  buildInputs = [

    zlib readline openssl libassuan

    libXt libxslt libiconv docbook_xml_dtd_412

  nativeBuildInputs = [

    pkg-config

    autoreconfHook

  ];

  buildInputs =

    [

      zlib

      readline

      openssl

      libassuan

      libXt

      libxslt

      libiconv

      docbook_xml_dtd_412

    ]

  ++ lib.optional stdenv.hostPlatform.isDarwin Carbon

  ++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]);

    ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Carbon

    ++ (if withApplePCSC then [ darwin.apple_sdk.frameworks.PCSC ] else [ pcsclite ]);



  env.NIX_CFLAGS_COMPILE = "-Wno-error";
@@ -39,22 +64,24 @@ stdenv.mkDerivation rec { 
    "--with-xsl-stylesheetsdir=${docbook_xsl}/xml/xsl/docbook"

    "--with-pcsc-provider=${

      if withApplePCSC then

        "${PCSC}/Library/Frameworks/PCSC.framework/PCSC"

        "${darwin.apple_sdk.frameworks.PCSC}/Library/Frameworks/PCSC.framework/PCSC"

      else

        "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}"

    }"

    (lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform)

      "XSLTPROC=${buildPackages.libxslt}/bin/xsltproc")

    (lib.optionalString (

      stdenv.hostPlatform != stdenv.buildPlatform

    ) "XSLTPROC=${buildPackages.libxslt}/bin/xsltproc")

  ];



  PCSC_CFLAGS = lib.optionalString withApplePCSC

    "-I${PCSC}/Library/Frameworks/PCSC.framework/Headers";

  PCSC_CFLAGS = lib.optionalString withApplePCSC "-I${darwin.apple_sdk.frameworks.PCSC}/Library/Frameworks/PCSC.framework/Headers";



  installFlags = [

    "sysconfdir=$(out)/etc"

    "completiondir=$(out)/etc"

  ];



  passthru.updateScript = nix-update-script { };



  meta = with lib; {

    description = "Set of libraries and utilities to access smart cards";

    homepage = "https://github.com/OpenSC/OpenSC/wiki";

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -4752,10 +4752,6 @@ with pkgs; 














  openrgb-plugin-hardwaresync = libsForQt5.callPackage ../applications/misc/openrgb-plugins/hardwaresync { };



























  opensc = callPackage ../tools/security/opensc {













    inherit (darwin.apple_sdk.frameworks) Carbon PCSC;













  };



























  toastify = darwin.apple_sdk_11_0.callPackage ../tools/misc/toastify {};





























  opensshPackages = dontRecurseIntoAttrs (callPackage ../tools/networking/openssh {});