charybdis: 3.5.5 -> 4.1

2 files changed, 10 insertions, 20 deletions

diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix
index befb4039ea09..332372830d69 100644
--- a/pkgs/servers/irc/charybdis/default.nix
+++ b/pkgs/servers/irc/charybdis/default.nix
@@ -1,28 +1,30 @@
-{ stdenv, fetchFromGitHub, bison, flex, openssl }:
+{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, openssl, gnutls }:
 
 stdenv.mkDerivation rec {
-  name = "charybdis-3.5.5";
+  name = "charybdis-4.1";
 
   src = fetchFromGitHub {
     owner = "charybdis-ircd";
     repo = "charybdis";
     rev = name;
-    sha256 = "16bl516hcj1chgzkfnpg9bf9s6zr314pqzhlz6641lgyzaw1z3w0";
+    sha256 = "1j0fjf4rdiyvakxqa97x272xra64rzjhbj8faciyb4b13pyrdsmw";
   };
 
-  patches = [
-     ./remove-setenv.patch
-  ];
+  postPatch = ''
+    substituteInPlace include/defaults.h --replace 'PKGLOCALSTATEDIR "' '"/var/lib/charybdis'
+  '';
+
+  autoreconfPhase = "sh autogen.sh";
 
   configureFlags = [
     "--enable-epoll"
     "--enable-ipv6"
     "--enable-openssl=${openssl.dev}"
     "--with-program-prefix=charybdis-"
-    "--sysconfdir=/etc/charybdis"
   ];
 
-  buildInputs = [ bison flex openssl ];
+  nativeBuildInputs = [ autoreconfHook bison flex ];
+  buildInputs = [ openssl gnutls ];
 
   meta = with stdenv.lib; {
     description = "IRCv3 server designed to be highly scalable";
diff --git a/pkgs/servers/irc/charybdis/remove-setenv.patch b/pkgs/servers/irc/charybdis/remove-setenv.patch
deleted file mode 100644
index c53c1ff294e0..000000000000
--- a/pkgs/servers/irc/charybdis/remove-setenv.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/bandbi.c b/src/bandbi.c
-index 03dd907..3698e85 100644
---- a/src/bandbi.c
-+++ b/src/bandbi.c
-@@ -82,7 +82,6 @@ start_bandb(void)
- 	const char *suffix = "";
- #endif
- 
--	rb_setenv("BANDB_DBPATH", PKGLOCALSTATEDIR "/ban.db", 1);
- 	if(bandb_path == NULL)
- 	{
- 		rb_snprintf(fullpath, sizeof(fullpath), "%s/bandb%s", PKGLIBEXECDIR, suffix);