summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/search
diff options
context:
space:
mode:
authorBojan Nikolic <bojan@bnikolic.co.uk>2015-12-18 13:51:58 +0000
committerBojan Nikolic <bojan@bnikolic.co.uk>2015-12-18 13:51:58 +0000
commit98d1abd46b19da84d55bd5ce13431305751f571c (patch)
treeb0d6ef28fd32a63b25b3243211ceaa1cd3c3bed9 /pkgs/applications/search
parent316406269d90c7aeb3194e94e1066fe3e2d95f57 (diff)
recoll: Disable --install-layout
Diffstat (limited to 'pkgs/applications/search')
-rw-r--r--pkgs/applications/search/recoll/default.nix2
-rw-r--r--pkgs/applications/search/recoll/nodeblayout.patch12
2 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index 1867fa532534..ff75aa0e9237 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
sha256 = "0ympk2w21cxfvysyx96p0npsa54csfc84cicpi8nsj1qp824zxwq";
};
+ patches = [ ./nodeblayout.patch ];
+
configureFlags = [ "--with-inotify" ];
buildInputs = [ qt4 xapian file python ];
diff --git a/pkgs/applications/search/recoll/nodeblayout.patch b/pkgs/applications/search/recoll/nodeblayout.patch
new file mode 100644
index 000000000000..39988423ae1f
--- /dev/null
+++ b/pkgs/applications/search/recoll/nodeblayout.patch
@@ -0,0 +1,12 @@
+diff -ru recoll-1.21.3-orig/recollinstall.in recoll-1.21.3/recollinstall.in
+--- recoll-1.21.3-orig/recollinstall.in 2015-09-28 08:08:42.000000000 +0100
++++ recoll-1.21.3/recollinstall.in 2015-12-13 22:48:30.361776374 +0000
+@@ -45,9 +45,6 @@
+ mandir=$DESTDIR/$mandir
+ ROOTFORPYTHON="--root=${DESTDIR}"
+ fi
+-if test -f /etc/debian_version ; then
+- OPTSFORPYTHON=--install-layout=deb
+-fi
+
+ echo "Installing to $PREFIX"