From 850c9d805a67d8ce10d97a3c3f5c808ddeac71c1 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 28 Feb 2018 17:44:09 -0800 Subject: [PATCH] recoll: Avoid using substituteInPlace on zip files --- pkgs/applications/search/recoll/default.nix | 44 +++++++++++---------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index da6ccf940c7a..ade8af254496 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -30,29 +30,31 @@ stdenv.mkDerivation rec { # the absolute path to the filtering command. postInstall = '' for f in $out/share/recoll/filters/* ; do - substituteInPlace $f --replace '"antiword"' '"${lib.getBin antiword}/bin/antiword"' - substituteInPlace $f --replace '"awk"' '"${lib.getBin gawk}/bin/awk"' - substituteInPlace $f --replace '"catppt"' '"${lib.getBin catdoc}/bin/catppt"' - substituteInPlace $f --replace '"djvused"' '"${lib.getBin djvulibre}/bin/djvused"' - substituteInPlace $f --replace '"djvutxt"' '"${lib.getBin djvulibre}/bin/djvutxt"' - substituteInPlace $f --replace '"egrep"' '"${lib.getBin gnugrep}/bin/egrep"' - substituteInPlace $f --replace '"groff"' '"${lib.getBin groff}/bin/groff"' - substituteInPlace $f --replace '"gunzip"' '"${lib.getBin gzip}/bin/gunzip"' - substituteInPlace $f --replace '"iconv"' '"${lib.getBin libiconv}/bin/iconv"' - substituteInPlace $f --replace '"pdftotext"' '"${lib.getBin poppler_utils}/bin/pdftotext"' - substituteInPlace $f --replace '"pstotext"' '"${lib.getBin ghostscript}/bin/ps2ascii"' - substituteInPlace $f --replace '"sed"' '"${lib.getBin gnused}/bin/sed"' - substituteInPlace $f --replace '"tar"' '"${lib.getBin gnutar}/bin/tar"' - substituteInPlace $f --replace '"unzip"' '"${lib.getBin unzip}/bin/unzip"' - substituteInPlace $f --replace '"xls2csv"' '"${lib.getBin catdoc}/bin/xls2csv"' - substituteInPlace $f --replace '"xsltproc"' '"${lib.getBin libxslt}/bin/xsltproc"' - substituteInPlace $f --replace '"unrtf"' '"${lib.getBin unrtf}/bin/unrtf"' - substituteInPlace $f --replace '"untex"' '"${lib.getBin untex}/bin/untex"' - substituteInPlace $f --replace '"wpd2html"' '"${lib.getBin libwpd}/bin/wpd2html"' - substituteInPlace $f --replace /usr/bin/perl ${lib.getBin perl}/bin/perl + if [[ ! "$f" =~ \.zip$ ]]; then + substituteInPlace $f --replace '"antiword"' '"${lib.getBin antiword}/bin/antiword"' + substituteInPlace $f --replace '"awk"' '"${lib.getBin gawk}/bin/awk"' + substituteInPlace $f --replace '"catppt"' '"${lib.getBin catdoc}/bin/catppt"' + substituteInPlace $f --replace '"djvused"' '"${lib.getBin djvulibre}/bin/djvused"' + substituteInPlace $f --replace '"djvutxt"' '"${lib.getBin djvulibre}/bin/djvutxt"' + substituteInPlace $f --replace '"egrep"' '"${lib.getBin gnugrep}/bin/egrep"' + substituteInPlace $f --replace '"groff"' '"${lib.getBin groff}/bin/groff"' + substituteInPlace $f --replace '"gunzip"' '"${lib.getBin gzip}/bin/gunzip"' + substituteInPlace $f --replace '"iconv"' '"${lib.getBin libiconv}/bin/iconv"' + substituteInPlace $f --replace '"pdftotext"' '"${lib.getBin poppler_utils}/bin/pdftotext"' + substituteInPlace $f --replace '"pstotext"' '"${lib.getBin ghostscript}/bin/ps2ascii"' + substituteInPlace $f --replace '"sed"' '"${lib.getBin gnused}/bin/sed"' + substituteInPlace $f --replace '"tar"' '"${lib.getBin gnutar}/bin/tar"' + substituteInPlace $f --replace '"unzip"' '"${lib.getBin unzip}/bin/unzip"' + substituteInPlace $f --replace '"xls2csv"' '"${lib.getBin catdoc}/bin/xls2csv"' + substituteInPlace $f --replace '"xsltproc"' '"${lib.getBin libxslt}/bin/xsltproc"' + substituteInPlace $f --replace '"unrtf"' '"${lib.getBin unrtf}/bin/unrtf"' + substituteInPlace $f --replace '"untex"' '"${lib.getBin untex}/bin/untex"' + substituteInPlace $f --replace '"wpd2html"' '"${lib.getBin libwpd}/bin/wpd2html"' + substituteInPlace $f --replace /usr/bin/perl ${lib.getBin perl}/bin/perl + fi done '' + stdenv.lib.optionalString stdenv.isLinux '' - substituteInPlace $f --replace lyx ${lib.getBin lyx}/bin/lyx + substituteInPlace $f --replace '"lyx"' '"${lib.getBin lyx}/bin/lyx"' ''; enableParallelBuilding = true;