Merge pull request #123643 from Lassulus/solanum

solanum: 2020-12-14 -> 2021-04-27
This commit is contained in:
Martin Weinelt 2021-05-20 20:05:49 +02:00 committed by GitHub
commit 108a8bde63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 10 deletions

View File

@ -0,0 +1,12 @@
diff --git a/ircd/bandbi.c b/ircd/bandbi.c
index 29a3bfa2..16a40f17 100644
--- a/ircd/bandbi.c
+++ b/ircd/bandbi.c
@@ -83,7 +83,6 @@ start_bandb(void)
const char *suffix = "";
#endif
- rb_setenv("BANDB_DBPATH", ircd_paths[IRCD_PATH_BANDB], 1);
if(bandb_path == NULL)
{
snprintf(fullpath, sizeof(fullpath), "%s%cbandb%s", ircd_paths[IRCD_PATH_LIBEXEC], RB_PATH_SEPARATOR, suffix);

View File

@ -1,27 +1,29 @@
{ lib, stdenv
, fetchFromGitHub
, autoreconfHook
, pkg-config
, bison
, fetchFromGitHub
, flex
, openssl
, sqlite
, lksctp-tools
, openssl
, pkg-config
, sqlite
, util-linux
}:
stdenv.mkDerivation rec {
pname = "solanum";
version = "unstable-2020-12-14";
version = "unstable-2021-04-27";
src = fetchFromGitHub {
owner = "solanum-ircd";
repo = pname;
rev = "551e5a146eab4948ce4a57d87a7f671f2d7cc02d";
sha256 = "14cd2cb04w6nwck7q49jw5zvifkzhkmblwhjfskc2nxcdb5x3l96";
rev = "3ff5a12e75662e9a642f2a4364797bd361eb0925";
sha256 = "14ywmfdv8cncbyg08y2qdis00kwg8lvhkcgj185is67smh0qf88f";
};
patches = [
./dont-create-logdir.patch
./bandb.patch # https://github.com/solanum-ircd/solanum/issues/156
];
configureFlags = [
@ -29,9 +31,9 @@ stdenv.mkDerivation rec {
"--enable-ipv6"
"--enable-openssl=${openssl.dev}"
"--with-program-prefix=solanum-"
"--localstatedir=/var/lib/solanum"
"--with-rundir=/run/solanum"
"--with-logdir=/var/log/solanum"
"--localstatedir=/var/lib"
"--with-rundir=/run"
"--with-logdir=/var/log"
] ++ lib.optionals (stdenv.isLinux) [
"--enable-sctp=${lksctp-tools.out}/lib"
];
@ -41,6 +43,7 @@ stdenv.mkDerivation rec {
bison
flex
pkg-config
util-linux
];
buildInputs = [