dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #97570 from woffs/recoll-qt5

Browse Source 
recoll: qt4 -> qt5, fix build
This commit is contained in:
WORLDofPEACE 2020-09-09 13:33:02 -04:00 committed by GitHub
commit 7e5991ede7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/search/recoll/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, lib, bison { mkDerivation, stdenv, fetchurl, lib, bison
, qt4, xapian, file, python, perl , qtbase, xapian, file, python, perl
, djvulibre, groff, libxslt, unzip, poppler_utils, antiword, catdoc, lyx , djvulibre, groff, libxslt, unzip, poppler_utils, antiword, catdoc, lyx
, libwpd, unrtf, untex , libwpd, unrtf, untex
, ghostscript, gawk, gnugrep, gnused, gnutar, gzip, libiconv, zlib , ghostscript, gawk, gnugrep, gnused, gnutar, gzip, libiconv, zlib
@ -7,7 +7,7 @@
assert stdenv.hostPlatform.system != "powerpc-linux"; assert stdenv.hostPlatform.system != "powerpc-linux";
stdenv.mkDerivation rec { mkDerivation rec {
ver = "1.24.5"; ver = "1.24.5";
name = "recoll-${ver}"; name = "recoll-${ver}";
@ -16,12 +16,12 @@ stdenv.mkDerivation rec {
sha256 = "10m3a0ghnyipjcxapszlr8adyy2yaaxx4vgrkxrfmz13814z89cv"; sha256 = "10m3a0ghnyipjcxapszlr8adyy2yaaxx4vgrkxrfmz13814z89cv";
}; };
configureFlags = [ "--enable-recollq" ] configureFlags = [ "--enable-recollq" "--disable-webkit" ]
++ lib.optionals (!withGui) [ "--disable-qtgui" "--disable-x11mon" ] ++ lib.optionals (!withGui) [ "--disable-qtgui" "--disable-x11mon" ]
++ (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]); ++ (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]);
buildInputs = [ xapian file python bison zlib ] buildInputs = [ xapian file python bison zlib ]
++ lib.optional withGui qt4 ++ lib.optional withGui qtbase
++ lib.optional stdenv.isDarwin libiconv; ++ lib.optional stdenv.isDarwin libiconv;
patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
# the filters search through ${PATH} using a sh proc 'checkcmds' for the # the filters search through ${PATH} using a sh proc 'checkcmds' for the
# filtering utils. Short circuit this by replacing the filtering command with # filtering utils. Short circuit this by replacing the filtering command with
# the absolute path to the filtering command. # the absolute path to the filtering command.
postInstall = '' postInstall = ''
for f in $out/share/recoll/filters/* ; do for f in $out/share/recoll/filters/* ; do
if [[ ! "$f" =~ \.zip$ ]]; then if [[ ! "$f" =~ \.zip$ ]]; then
@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
description = "A full-text search tool"; description = "A full-text search tool";
longDescription = '' longDescription = ''
Recoll is an Xapian frontend that can search through files, archive Recoll is an Xapian frontend that can search through files, archive
members, email attachments. members, email attachments.
''; '';
homepage = "https://www.lesbonscomptes.com/recoll/"; homepage = "https://www.lesbonscomptes.com/recoll/";
license = licenses.gpl2; license = licenses.gpl2;

2
pkgs/top-level/all-packages.nix
View File

@ -6595,7 +6595,7 @@ in
recutils = callPackage ../tools/misc/recutils { }; recutils = callPackage ../tools/misc/recutils { };
recoll = callPackage ../applications/search/recoll { }; recoll = libsForQt5.callPackage ../applications/search/recoll { };
redoc-cli = nodePackages.redoc-cli; redoc-cli = nodePackages.redoc-cli;