Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7d9c1b2dcabc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d3de5b05340c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 23, 2020

  1. recoll: refactor and 1.24.5 -> 1.27.12 

    Refactor Changes:

- name -> pname + version
- python2 -> python3
- add pkg-config (to find libxslt)
- patch /usr/share/recoll to $out/share/recoll
- remove Makefile patch for macOS that has been merged upstream (
  https://framagit.org/medoc92/recoll/-/commit/b5c5734d064c638b702601fd391037a35b5bb2a1 )
    @fabianhjr
    fabianhjr committed Nov 23, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    bagder Daniel Stenberg
    GPG key ID: 5CC908FDB71E12C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3ec7527 View commit details

Commits on Nov 24, 2020

  1. Merge pull request #104699 from LibreCybernetics/update-recoll 

    recoll: refactor and 1.24.5 -> 1.27.12
    @ryantm
    ryantm authored Nov 24, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    bagder Daniel Stenberg
    GPG key ID: 5CC908FDB71E12C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d3de5b0 View commit details
Showing with 65 additions and 37 deletions.
  1. +65 −37 pkgs/applications/search/recoll/default.nix
102 changes: 65 additions & 37 deletions pkgs/applications/search/recoll/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,60 +1,88 @@
{ mkDerivation, stdenv, fetchurl, lib, bison
, qtbase, xapian, file, python, perl
, djvulibre, groff, libxslt, unzip, poppler_utils, antiword, catdoc, lyx
, libwpd, unrtf, untex
, ghostscript, gawk, gnugrep, gnused, gnutar, gzip, libiconv, zlib
, withGui ? true }:
{ stdenv
, fetchurl
, lib
, mkDerivation
, antiword
, bison
, catdoc
, chmlib
, djvulibre
, file
, gawk
, ghostscript
, gnugrep
, gnused
, gnutar
, groff
, gzip
, libiconv
, libwpd
, libxslt
, lyx
, perl
, pkg-config
, poppler_utils
, python3Packages
, qtbase
, unrtf
, untex
, unzip
, which
, xapian
, zlib
, withGui ? true
}:

assert stdenv.hostPlatform.system != "powerpc-linux";

mkDerivation rec {
ver = "1.24.5";
name = "recoll-${ver}";
pname = "recoll";
version = "1.27.12";

src = fetchurl {
url = "https://www.lesbonscomptes.com/recoll/${name}.tar.gz";
sha256 = "10m3a0ghnyipjcxapszlr8adyy2yaaxx4vgrkxrfmz13814z89cv";
url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz";
sha256 = "0bgadm8p319fws66ca4rpv9fx2bllbphgn892rh78db81lz20i5v";
};

configureFlags = [ "--enable-recollq" "--disable-webkit" ]
++ lib.optionals (!withGui) [ "--disable-qtgui" "--disable-x11mon" ]
++ (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]);

buildInputs = [ xapian file python bison zlib ]
++ lib.optional withGui qtbase
++ lib.optional stdenv.isDarwin libiconv;
nativeBuildInputs = [ pkg-config ];

patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i 's/-Wl,--no-undefined -Wl,--warn-unresolved-symbols//' Makefile.am
sed -i 's/-Wl,--no-undefined -Wl,--warn-unresolved-symbols//' Makefile.in
'';
buildInputs = with python3Packages; [
bison chmlib file python setuptools which xapian zlib
] ++ lib.optional withGui qtbase
++ lib.optional stdenv.isDarwin libiconv;

# the filters search through ${PATH} using a sh proc 'checkcmds' for the
# filtering utils. Short circuit this by replacing the filtering command with
# the absolute path to the filtering command.
postInstall = ''
substituteInPlace $out/lib/*/site-packages/recoll/rclconfig.py --replace /usr/share/recoll $out/share/recoll
substituteInPlace $out/share/recoll/filters/rclconfig.py --replace /usr/share/recoll $out/share/recoll
for f in $out/share/recoll/filters/* ; do
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
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 ''