charybdis: 3.5.5 -> 4.1

This commit is contained in:
Franz Pletz 2018-07-15 21:30:59 +02:00
parent ddf898006e
commit 0b2b4b8c4e
No known key found for this signature in database
GPG key ID: 846FDED7792617B4
2 changed files with 10 additions and 20 deletions

View file

@ -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";

View file

@ -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);