From a4cb007999e3f6803fab4c695f61c3cd53ef674a Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 19 Jul 2015 18:50:45 +0200 Subject: [PATCH] Zpkgs tv charybdis: import from NixOS master --- Zpkgs/tv/charybdis/default.nix | 34 ++++++++++++++++++++++++++ Zpkgs/tv/charybdis/remove-setenv.patch | 12 +++++++++ Zpkgs/tv/default.nix | 1 + 3 files changed, 47 insertions(+) create mode 100644 Zpkgs/tv/charybdis/default.nix create mode 100644 Zpkgs/tv/charybdis/remove-setenv.patch diff --git a/Zpkgs/tv/charybdis/default.nix b/Zpkgs/tv/charybdis/default.nix new file mode 100644 index 000000000..a38a25c8a --- /dev/null +++ b/Zpkgs/tv/charybdis/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchgit, bison, flex, openssl }: + +stdenv.mkDerivation rec { + name = "charybdis-3.5.0-rc1"; + + src = fetchgit { + url = "https://github.com/atheme/charybdis.git"; + rev = "43a9b61c427cd0f3fa2c192890b8a48d9ea6fb7f"; + sha256 = "ae2c8a72e6a29c901f9b51759b542ee12c4ec918050a2d9d65e5635077a0fcef"; + }; + + patches = [ + ./remove-setenv.patch + ]; + + configureFlags = [ + "--enable-epoll" + "--enable-ipv6" + "--enable-openssl=${openssl}" + "--with-program-prefix=charybdis-" + ]; + + buildInputs = [ bison flex openssl ]; + + meta = { + description = "An extremely scalable ircd with some cooperation with the ratbox and ircu guys"; + homepage = https://github.com/atheme/charybdis; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.lassulus ]; + platforms = stdenv.lib.platforms.linux; + }; + + +} diff --git a/Zpkgs/tv/charybdis/remove-setenv.patch b/Zpkgs/tv/charybdis/remove-setenv.patch new file mode 100644 index 000000000..c53c1ff29 --- /dev/null +++ b/Zpkgs/tv/charybdis/remove-setenv.patch @@ -0,0 +1,12 @@ +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); diff --git a/Zpkgs/tv/default.nix b/Zpkgs/tv/default.nix index 6c4277496..10147d463 100644 --- a/Zpkgs/tv/default.nix +++ b/Zpkgs/tv/default.nix @@ -2,6 +2,7 @@ pkgs // { + charybdis = pkgs.callPackage ./charybdis {}; dic = pkgs.callPackage ./dic.nix {}; genid = pkgs.callPackage ./genid.nix {}; github-hosts-sync = pkgs.callPackage ./github-hosts-sync.nix {};