diff options
author | Frank Doepper <github@woffs.de> | 2020-09-09 19:10:17 +0200 |
---|---|---|
committer | Frank Doepper <github@woffs.de> | 2020-09-09 19:28:32 +0200 |
commit | 9cdfa8adc25daaabe4e08de040826a088f2f0dc9 (patch) | |
tree | 036220b330aa5eeeacb2207c4e80e49cfa2a5ee2 /pkgs/applications/search/recoll | |
parent | f6a3e70c5071bfa85b6be03b74719b5c30a4aaef (diff) | |
download | nixlib-9cdfa8adc25daaabe4e08de040826a088f2f0dc9.tar nixlib-9cdfa8adc25daaabe4e08de040826a088f2f0dc9.tar.gz nixlib-9cdfa8adc25daaabe4e08de040826a088f2f0dc9.tar.bz2 nixlib-9cdfa8adc25daaabe4e08de040826a088f2f0dc9.tar.lz nixlib-9cdfa8adc25daaabe4e08de040826a088f2f0dc9.tar.xz nixlib-9cdfa8adc25daaabe4e08de040826a088f2f0dc9.tar.zst nixlib-9cdfa8adc25daaabe4e08de040826a088f2f0dc9.zip |
recoll: qt4 -> qt5, fix build
Diffstat (limited to 'pkgs/applications/search/recoll')
-rw-r--r-- | pkgs/applications/search/recoll/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 425e82000b79..fe9719efdef8 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, lib, bison -, qt4, xapian, file, python, perl +{ 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 @@ -7,7 +7,7 @@ assert stdenv.hostPlatform.system != "powerpc-linux"; -stdenv.mkDerivation rec { +mkDerivation rec { ver = "1.24.5"; name = "recoll-${ver}"; @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { sha256 = "10m3a0ghnyipjcxapszlr8adyy2yaaxx4vgrkxrfmz13814z89cv"; }; - configureFlags = [ "--enable-recollq" ] + 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 qt4 + ++ lib.optional withGui qtbase ++ lib.optional stdenv.isDarwin libiconv; 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 # 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 = '' for f in $out/share/recoll/filters/* ; do if [[ ! "$f" =~ \.zip$ ]]; then @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { description = "A full-text search tool"; longDescription = '' Recoll is an Xapian frontend that can search through files, archive - members, email attachments. + members, email attachments. ''; homepage = "https://www.lesbonscomptes.com/recoll/"; license = licenses.gpl2; |