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/misc/mdbtools | |
| parent | 362d75975045c185e67cb0b66baa43d4d5e337c4 (diff) | |
| download | nixpkgs-e08b9ab8d3d6362c774a786797347fa7483af773.tar nixpkgs-e08b9ab8d3d6362c774a786797347fa7483af773.tar.gz nixpkgs-e08b9ab8d3d6362c774a786797347fa7483af773.tar.bz2 nixpkgs-e08b9ab8d3d6362c774a786797347fa7483af773.tar.lz nixpkgs-e08b9ab8d3d6362c774a786797347fa7483af773.tar.xz nixpkgs-e08b9ab8d3d6362c774a786797347fa7483af773.tar.zst nixpkgs-e08b9ab8d3d6362c774a786797347fa7483af773.zip | |
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/misc/mdbtools')
| -rw-r--r-- | pkgs/tools/misc/mdbtools/git.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/misc/mdbtools/git.nix b/pkgs/tools/misc/mdbtools/git.nix index 9262c6e8eb8..8cf5e5e9a38 100644 --- a/pkgs/tools/misc/mdbtools/git.nix +++ b/pkgs/tools/misc/mdbtools/git.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, glib, readline, bison, flex, pkgconfig, - libiconvOrEmpty, autoconf, automake, libtool, which, txt2man, gnome_doc_utils, + libiconv, autoconf, automake, libtool, which, txt2man, gnome_doc_utils, scrollkeeper}: stdenv.mkDerivation { @@ -13,8 +13,8 @@ stdenv.mkDerivation { buildInputs = [ glib readline bison flex pkgconfig autoconf automake - libtool which txt2man gnome_doc_utils scrollkeeper - ] ++ libiconvOrEmpty; + libtool which txt2man gnome_doc_utils scrollkeeper libiconv + ]; preConfigure = '' sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c |