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/applications/search/recoll | |
| 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/applications/search/recoll')
| -rw-r--r-- | pkgs/applications/search/recoll/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 6bfa7c7905b0..4274f73c7e56 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl , qt4, xapian, file, python , djvulibre, groff, libxslt, unzip, xpdf, antiword, catdoc, lyx -, ghostscript, gawk, gnugrep, gnused, gnutar, gzip, libiconvOrLibc }: +, ghostscript, gawk, gnugrep, gnused, gnutar, gzip, libiconv }: assert stdenv.system != "powerpc-linux"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { substituteInPlace $f --replace grep ${gnugrep}/bin/grep substituteInPlace $f --replace groff ${groff}/bin/groff substituteInPlace $f --replace gunzip ${gzip}/bin/gunzip - substituteInPlace $f --replace iconv ${libiconvOrLibc}/bin/iconv + substituteInPlace $f --replace iconv ${libiconv}/bin/iconv substituteInPlace $f --replace lyx ${lyx}/bin/lyx substituteInPlace $f --replace pdftotext ${xpdf}/bin/pdftotext substituteInPlace $f --replace pstotext ${ghostscript}/bin/ps2ascii |