Merge branch 'staging'

2015-08-25 14:14:54 +02:00
parent 60a0bb7f66 c234f37b59
commit e4644a5b58
112 changed files with 1631 additions and 952 deletions
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, npth
+{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, libiconv, npth
 , autoreconfHook, gettext, texinfo, pcsclite

 # Each of the dependencies below are optional.
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
  '';

  buildInputs = [
-    pkgconfig libgcrypt libassuan libksba npth
+    pkgconfig libgcrypt libassuan libksba libiconv npth
    autoreconfHook gettext texinfo
    readline libusb gnutls adns openldap zlib bzip2
  ];