opensc: update to version 0.13.0

3 files changed, 37 insertions, 31 deletions

diff --git a/pkgs/tools/security/opensc/0.11.7.nix b/pkgs/tools/security/opensc/0.11.7.nix
deleted file mode 100644
index 526b0276848..00000000000
--- a/pkgs/tools/security/opensc/0.11.7.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{stdenv, fetchurl, libtool, readline, zlib, openssl, libiconv, pcsclite,
-  libassuan1, pkgconfig, libXt, pinentry}:
-
-stdenv.mkDerivation rec {
-  name = "opensc-0.11.7";
-
-  src = fetchurl {
-    url = "http://www.opensc-project.org/files/opensc/${name}.tar.gz";
-    sha256 = "0781qi0bsm01wdhkb1vd3ra9wkwgyjcm2w87jb2r53msply2gavd";
-  };
-
-  configureFlags = [ "--enable-pcsc" "--enable-nsplugin"
-    "--with-pcsc-provider=${pcsclite}/lib/libpcsclite.so.1"
-    "--with-pinentry=${pinentry}/bin/pinentry" ];
-
-  buildInputs = [ libtool readline zlib openssl pcsclite libassuan1 pkgconfig
-    libXt ] ++
-    stdenv.lib.optional (! stdenv.isLinux) libiconv;
-
-  meta = {
-    description = "Set of libraries and utilities to access smart cards";
-    homepage = http://www.opensc-project.org/opensc/;
-    license = "LGPL";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix
new file mode 100644
index 00000000000..42303fc356a
--- /dev/null
+++ b/pkgs/tools/security/opensc/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, libtool, readline, zlib, openssl, libiconvOrNull, pcsclite
+, libassuan1, pkgconfig, libXt, docbook_xsl, libxslt, docbook_xml_dtd_412
+}:
+
+stdenv.mkDerivation rec {
+  name = "opensc-0.13.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/opensc/${name}.tar.gz";
+    sha256 = "054v11yc2lqlfqs556liw18klhkx9zyjylqcwirk4axiafp4dpmb";
+  };
+
+  buildInputs = [ libtool readline zlib openssl pcsclite libassuan1 pkgconfig
+    libXt libxslt libiconvOrNull docbook_xml_dtd_412
+  ];
+
+  configureFlags = [
+    "--enable-doc"
+    "--enable-man"
+    "--enable-openssl"
+    "--enable-pcsc"
+    "--enable-readline"
+    "--enable-sm"
+    "--enable-zlib"
+    "--with-pcsc-provider=${pcsclite}/lib/libpcsclite.so.1"
+    "--with-xsl-stylesheetsdir=${docbook_xsl}/xml/xsl/docbook"
+  ];
+
+  meta = {
+    description = "Set of libraries and utilities to access smart cards";
+    homepage = "https://github.com/OpenSC/OpenSC/wiki";
+    license = stdenv.lib.licenses.lgpl21Plus;
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac304ad462b..abe3644b5c3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1490,9 +1490,7 @@ let
 
   openresolv = callPackage ../tools/networking/openresolv { };
 
-  opensc_0_11_7 = callPackage ../tools/security/opensc/0.11.7.nix { };
-
-  opensc = opensc_0_11_7;
+  opensc = callPackage ../tools/security/opensc { };
 
   opensc_dnie_wrapper = callPackage ../tools/security/opensc-dnie-wrapper { };