diff --git a/pkgs/by-name/op/opensc/package.nix b/pkgs/by-name/op/opensc/package.nix new file mode 100644 index 000000000000..0f0e5b50757d --- /dev/null +++ b/pkgs/by-name/op/opensc/package.nix @@ -0,0 +1,92 @@ +{ + 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.26.0"; + + src = fetchFromGitHub { + owner = "OpenSC"; + repo = "OpenSC"; + rev = version; + sha256 = "sha256-EIQ9YpIGwckg/JjpK0S2ZYdFf/0YC4KaWcLXRNRMuzA="; + }; + + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; + buildInputs = + [ + zlib + readline + openssl + libassuan + libXt + libxslt + libiconv + docbook_xml_dtd_412 + ] + ++ 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"; + + configureFlags = [ + "--enable-zlib" + "--enable-readline" + "--enable-openssl" + "--enable-pcsc" + "--enable-sm" + "--enable-man" + "--enable-doc" + "--localstatedir=/var" + "--sysconfdir=/etc" + "--with-xsl-stylesheetsdir=${docbook_xsl}/xml/xsl/docbook" + "--with-pcsc-provider=${ + if withApplePCSC then + "${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") + ]; + + 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"; + license = licenses.lgpl21Plus; + platforms = platforms.all; + maintainers = [ maintainers.michaeladler ]; + }; +} diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix deleted file mode 100644 index 412053af2b4b..000000000000 --- a/pkgs/tools/security/opensc/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ 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 -}: - -stdenv.mkDerivation rec { - pname = "opensc"; - version = "0.25.1"; - - src = fetchFromGitHub { - owner = "OpenSC"; - repo = "OpenSC"; - rev = version; - sha256 = "sha256-Ktvp/9Hca87qWmDlQhFzvWsr7TvNpIAvOFS+4zTZbB8="; - }; - - 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 ]); - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - configureFlags = [ - "--enable-zlib" - "--enable-readline" - "--enable-openssl" - "--enable-pcsc" - "--enable-sm" - "--enable-man" - "--enable-doc" - "--localstatedir=/var" - "--sysconfdir=/etc" - "--with-xsl-stylesheetsdir=${docbook_xsl}/xml/xsl/docbook" - "--with-pcsc-provider=${ - if withApplePCSC then - "${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") - ]; - - PCSC_CFLAGS = lib.optionalString withApplePCSC - "-I${PCSC}/Library/Frameworks/PCSC.framework/Headers"; - - installFlags = [ - "sysconfdir=$(out)/etc" - "completiondir=$(out)/etc" - ]; - - meta = with lib; { - description = "Set of libraries and utilities to access smart cards"; - homepage = "https://github.com/OpenSC/OpenSC/wiki"; - license = licenses.lgpl21Plus; - platforms = platforms.all; - maintainers = [ maintainers.michaeladler ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f17bb68cdcf7..0ebffaa70335 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {});