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/development/libraries/p11-kit | |
| 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/development/libraries/p11-kit')
| -rw-r--r-- | pkgs/development/libraries/p11-kit/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index d1778093868c..0ecbc109d39d 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libiconvOrEmpty, pkgconfig, libffi, libtasn1 }: +{ stdenv, fetchurl, libiconv, pkgconfig, libffi, libtasn1 }: stdenv.mkDerivation rec { name = "p11-kit-0.20.2"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { configureFlags = "--without-libtasn1"; - buildInputs = [ pkgconfig libffi libtasn1 ] ++ libiconvOrEmpty; + buildInputs = [ pkgconfig libffi libtasn1 libiconv ]; meta = { homepage = http://p11-glue.freedesktop.org/; |