From ca58f58a0b2bb6df5415ded1b740cbfff4653d23 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Thu, 27 Feb 2020 16:16:57 +0100
Subject: [PATCH 1/5] sphinxsearch: add valodim as maintainer

---
 pkgs/servers/search/sphinxsearch/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix
index 6241380ea0c..fb2ad948241 100644
--- a/pkgs/servers/search/sphinxsearch/default.nix
+++ b/pkgs/servers/search/sphinxsearch/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation {
     homepage    = http://sphinxsearch.com;
     license     = stdenv.lib.licenses.gpl2;
     platforms   = stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ ederoyd46 ];
+    maintainers = with stdenv.lib.maintainers; [ ederoyd46 valodim ];
   };
 }

From f14b3aa8c01834ac3baf62f4d590c539b5151b06 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Fri, 21 Feb 2020 13:33:57 +0100
Subject: [PATCH 2/5] sphinxsearch: add support for mysql sources

---
 pkgs/servers/search/sphinxsearch/default.nix | 27 ++++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix
index fb2ad948241..bcba015333f 100644
--- a/pkgs/servers/search/sphinxsearch/default.nix
+++ b/pkgs/servers/search/sphinxsearch/default.nix
@@ -1,24 +1,29 @@
-{ stdenv, fetchurl, pkgconfig,
-  version ? "2.2.11",
-  mainSrc ? fetchurl {
-    url = "http://sphinxsearch.com/files/sphinx-${version}-release.tar.gz";
-    sha256 = "1aa1mh32y019j8s3sjzn4vwi0xn83dwgl685jnbgh51k16gh6qk6";
-  }
+{ stdenv, fetchurl, pkg-config, libmysqlclient,
+  enableMysql ? true
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "sphinxsearch";
-  inherit version;
-  src = mainSrc;
+  version = "2.2.11";
+
+  src = fetchurl {
+    url = "http://sphinxsearch.com/files/sphinx-${version}-release.tar.gz";
+    sha256 = "1aa1mh32y019j8s3sjzn4vwi0xn83dwgl685jnbgh51k16gh6qk6";
+  };
 
   configureFlags = [
     "--program-prefix=sphinxsearch-"
-    "--without-mysql"
     "--enable-id64"
+  ] ++ stdenv.lib.optionals (!enableMysql) [
+    "--without-mysql"
   ];
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
+  ];
+
+  buildInputs = stdenv.lib.optionals enableMysql [
+    libmysqlclient
   ];
 
   meta = {

From f70dbff52912153c4ff6b21108dfd40ee6c091fe Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Fri, 21 Feb 2020 13:34:38 +0100
Subject: [PATCH 3/5] sphinxsearch: add optional support for xmlpipe2

---
 pkgs/servers/search/sphinxsearch/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix
index bcba015333f..cee94bc81d5 100644
--- a/pkgs/servers/search/sphinxsearch/default.nix
+++ b/pkgs/servers/search/sphinxsearch/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, pkg-config, libmysqlclient,
+{ stdenv, fetchurl, pkg-config, expat, libmysqlclient,
+  enableXmlpipe2 ? false,
   enableMysql ? true
 }:
 
@@ -24,6 +25,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = stdenv.lib.optionals enableMysql [
     libmysqlclient
+  ] ++ stdenv.lib.optionals enableXmlpipe2 [
+    expat
   ];
 
   meta = {

From f06174d1356f68feb0530eba33da25d326bd0d96 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Fri, 21 Feb 2020 13:46:57 +0100
Subject: [PATCH 4/5] sphinxsearch: enable parallel builds

---
 pkgs/servers/search/sphinxsearch/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix
index cee94bc81d5..f32bcf1a6ba 100644
--- a/pkgs/servers/search/sphinxsearch/default.nix
+++ b/pkgs/servers/search/sphinxsearch/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "1aa1mh32y019j8s3sjzn4vwi0xn83dwgl685jnbgh51k16gh6qk6";
   };
 
+  enableParallelBuilding = true;
+
   configureFlags = [
     "--program-prefix=sphinxsearch-"
     "--enable-id64"

From 6a6bf70e48680d23786e338806f940838e742394 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Thu, 27 Feb 2020 16:19:40 +0100
Subject: [PATCH 5/5] sphinxsearch: add workaround for darwin build failures

upstream bug: see http://sphinxsearch.com/bugs/view.php?id=2578
fix ported from Homebrew: https://github.com/Homebrew/homebrew-core/pull/8619
---
 pkgs/servers/search/sphinxsearch/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix
index f32bcf1a6ba..5c29d8b4780 100644
--- a/pkgs/servers/search/sphinxsearch/default.nix
+++ b/pkgs/servers/search/sphinxsearch/default.nix
@@ -31,6 +31,14 @@ stdenv.mkDerivation rec {
     expat
   ];
 
+  CXXFLAGS = with stdenv.lib; concatStringsSep " " (optionals stdenv.isDarwin [
+    # see upstream bug: http://sphinxsearch.com/bugs/view.php?id=2578
+    # workaround for "error: invalid suffix on literal
+    "-Wno-reserved-user-defined-literal"
+    # workaround for "error: non-constant-expression cannot be narrowed from type 'long' to 'int'"
+    "-Wno-c++11-narrowing"
+  ]);
+
   meta = {
     description = "An open source full text search server";
     homepage    = http://sphinxsearch.com;