summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/search
diff options
context:
space:
mode:
authorGabriel Arazas <foo.dogsquared@gmail.com>2022-11-11 13:03:09 +0800
committerEmery Hemingway <ehmry@posteo.net>2022-12-22 14:01:45 -0600
commit41f4a69fd5dab40775968f9456632b9fc5ab0580 (patch)
tree0836887bbdb0fe79240f041d939277c4e9362788 /pkgs/applications/search
parent3930bcb3c3998dacc7158b30b778213c5cee06a2 (diff)
recoll: 1.32.7 -> 1.33.2
Diffstat (limited to 'pkgs/applications/search')
-rw-r--r--pkgs/applications/search/recoll/default.nix4
-rw-r--r--pkgs/applications/search/recoll/fix-datadir.patch12
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index 4117c8ac78a9..ee258373dc33 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -35,11 +35,11 @@
mkDerivation rec {
pname = "recoll";
- version = "1.32.7";
+ version = "1.33.2";
src = fetchurl {
url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz";
- sha256 = "sha256-ygim9LsLUZv5FaBiqbeq3E80NHPMHweJVwggjWYzfbo=";
+ sha256 = "sha256-ql4VHiblIn8uihUbF1htPnpvjw0qMxdzW8HLGlUrZW0=";
};
configureFlags = [ "--enable-recollq" "--disable-webkit" "--without-systemd" ]
diff --git a/pkgs/applications/search/recoll/fix-datadir.patch b/pkgs/applications/search/recoll/fix-datadir.patch
index 3b316f4d90c6..7d5471b636e8 100644
--- a/pkgs/applications/search/recoll/fix-datadir.patch
+++ b/pkgs/applications/search/recoll/fix-datadir.patch
@@ -1,13 +1,13 @@
diff --git a/utils/rclutil.cpp b/utils/rclutil.cpp
-index 60ff5fb..4a59ccc 100644
+index 6bafc119..d997cd17 100644
--- a/utils/rclutil.cpp
+++ b/utils/rclutil.cpp
@@ -279,7 +279,7 @@ const string& path_pkgdatadir()
"a subfolder of the installation directory. \n"
"Please set the RECOLL_DATADIR environment variable to point to it\n"
"(e.g. setx RECOLL_DATADIR \"C:/Program Files (X86)/Recoll/Share)\"\n";
--#elif defined(__APPLE__) && !defined(MACPORTS) && !defined(HOMEBREW)
-+#elif defined(__APPLE__) && !defined(MACPORTS) && !defined(HOMEBREW) && !defined(NIXPKGS)
- uint32_t size = 0;
- _NSGetExecutablePath(nullptr, &size);
- char *path= (char*)malloc(size+1);
+-#elif defined(__APPLE__) && defined(RECOLL_AS_MAC_BUNDLE)
++#elif defined(__APPLE__) && defined(RECOLL_AS_MAC_BUNDLE) && defined(NIXPKGS)
+ // The package manager builds (Macports, Homebrew, Nixpkgs ...) all arrange to set a proper
+ // compiled value for RECOLL_DATADIR. We can't do this when building a native bundle with
+ // QCreator, in which case we use the executable location.