diff options
author | Eric Seidel <gridaphobe@gmail.com> | 2014-11-26 15:16:50 -0800 |
---|---|---|
committer | Eric Seidel <gridaphobe@gmail.com> | 2015-02-07 20:29:28 -0800 |
commit | e08b9ab8d3d6362c774a786797347fa7483af773 (patch) | |
tree | f64e5ce1224cb2cb8d5cfa0840bbb86daa68ecc3 /pkgs/tools/security/opensc | |
parent | 362d75975045c185e67cb0b66baa43d4d5e337c4 (diff) |
kill libiconvOr*
Conflicts: pkgs/applications/networking/mailreaders/sup/default.nix pkgs/development/compilers/ghc/7.8.3-binary.nix pkgs/development/interpreters/php/5.3.nix pkgs/development/interpreters/ruby/patches.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/poppler/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/tools/security/opensc')
-rw-r--r-- | pkgs/tools/security/opensc/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 42303fc356aae..31ad1108ddad2 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtool, readline, zlib, openssl, libiconvOrNull, pcsclite +{ stdenv, fetchurl, libtool, readline, zlib, openssl, libiconv, pcsclite , libassuan1, pkgconfig, libXt, docbook_xsl, libxslt, docbook_xml_dtd_412 }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libtool readline zlib openssl pcsclite libassuan1 pkgconfig - libXt libxslt libiconvOrNull docbook_xml_dtd_412 + libXt libxslt libiconv docbook_xml_dtd_412 ]; configureFlags = [ |