From 79b81c31d4f4126bc021b2b7330479ca10869522 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 10 Jun 2018 14:29:53 -0500 Subject: [PATCH] recoll: Add support to build without QT --- pkgs/applications/search/recoll/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 8c442f31cd14..01a4f4023023 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -2,7 +2,8 @@ , qt4, xapian, file, python, perl , djvulibre, groff, libxslt, unzip, poppler_utils, antiword, catdoc, lyx , libwpd, unrtf, untex -, ghostscript, gawk, gnugrep, gnused, gnutar, gzip, libiconv }: +, ghostscript, gawk, gnugrep, gnused, gnutar, gzip, libiconv, zlib +, withGui ? true }: assert stdenv.system != "powerpc-linux"; @@ -15,10 +16,13 @@ stdenv.mkDerivation rec { sha256 = "186bj8zx2xw9hwrzvzxdgdin9nj7msiqh5j57w5g7j4abdlsisjn"; }; - configureFlags = [ "--enable-recollq" ] ++ - (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]); + configureFlags = [ "--enable-recollq" ] + ++ lib.optionals (!withGui) [ "--disable-qtgui" "--disable-x11mon" ] + ++ (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]); - buildInputs = [ qt4 xapian file python bison ]; + buildInputs = [ xapian file python bison zlib ] + ++ lib.optional withGui qt4 + ++ lib.optional stdenv.isDarwin libiconv; patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/-Wl,--no-undefined -Wl,--warn-unresolved-symbols//' Makefile.am