cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #172950 from marsam/update-recoll

Browse source 
recoll: 1.31.0 -> 1.32.0
This commit is contained in:
Mario Rodas 2022-05-14 11:17:08 -05:00 committed by GitHub
commit 1262b3c421
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/applications/search/recoll/default.nix
View file

@ -35,14 +35,14 @@
mkDerivation rec { mkDerivation rec {
pname = "recoll"; pname = "recoll";
version = "1.31.0"; version = "1.32.0";
src = fetchurl { src = fetchurl {
url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz"; url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-TtkfohzeT0HO6ywCMNxrODW1DnJg5KMFkx9AbDfQt+c="; sha256 = "sha256-4kt6g5MVZTyYLSH7q2z72nzAsU6fatC0vTebEKhSA6E=";
}; };
configureFlags = [ "--enable-recollq" "--disable-webkit" ] configureFlags = [ "--enable-recollq" "--disable-webkit" "--without-systemd" ]
++ 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" ]);
@ -87,6 +87,9 @@ mkDerivation rec {
done done
'' + lib.optionalString stdenv.isLinux '' '' + lib.optionalString stdenv.isLinux ''
substituteInPlace $f --replace '"lyx"' '"${lib.getBin lyx}/bin/lyx"' substituteInPlace $f --replace '"lyx"' '"${lib.getBin lyx}/bin/lyx"'
'' + lib.optionalString (stdenv.isDarwin && withGui) ''
mkdir $out/Applications
mv $out/bin/recoll.app $out/Applications
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;