Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199'

git-subtree-dir: nixpkgs
git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a
git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199

2 files changed, 72 insertions, 0 deletions

diff --git a/nixpkgs/pkgs/tools/networking/eggdrop/b34a33255f56bbd2317c26da12d702796d67ed50.patch b/nixpkgs/pkgs/tools/networking/eggdrop/b34a33255f56bbd2317c26da12d702796d67ed50.patch
new file mode 100644
index 000000000000..03277838e887
--- /dev/null
+++ b/nixpkgs/pkgs/tools/networking/eggdrop/b34a33255f56bbd2317c26da12d702796d67ed50.patch
@@ -0,0 +1,36 @@
+From b34a33255f56bbd2317c26da12d702796d67ed50 Mon Sep 17 00:00:00 2001
+From: Geo Van Osterom <george.vo@alum.rpi.edu>
+Date: Thu, 22 Oct 2015 00:12:42 -0400
+Subject: [PATCH] Fix gcc 5 compile errors
+
+---
+ src/net.c     | 2 +-
+ src/tclhash.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/net.c b/src/net.c
+index a1937de..c369fda 100644
+--- a/src/net.c
++++ b/src/net.c
+@@ -560,7 +560,7 @@ int open_address_listen(sockname_t *addr)
+ /* Returns a socket number for a listening socket that will accept any
+  * connection -- port # is returned in port
+  */
+-inline int open_listen(int *port)
++extern inline int open_listen(int *port)
+ {
+   int sock;
+   sockname_t name;
+diff --git a/src/tclhash.c b/src/tclhash.c
+index 9729acb..22c3d05 100644
+--- a/src/tclhash.c
++++ b/src/tclhash.c
+@@ -113,7 +113,7 @@ static inline void tcl_bind_list_delete(tcl_bind_list_t *tl)
+   nfree(tl);
+ }
+
+-inline void garbage_collect_tclhash(void)
++extern inline void garbage_collect_tclhash(void)
+ {
+   tcl_bind_list_t *tl, *tl_next, *tl_prev;
+   tcl_bind_mask_t *tm, *tm_next, *tm_prev;
diff --git a/nixpkgs/pkgs/tools/networking/eggdrop/default.nix b/nixpkgs/pkgs/tools/networking/eggdrop/default.nix
new file mode 100644
index 000000000000..12d9da87b39b
--- /dev/null
+++ b/nixpkgs/pkgs/tools/networking/eggdrop/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, tcl }:
+
+stdenv.mkDerivation rec {
+  name = "eggdrop-${version}";
+  version = "1.6.21-nix1";
+
+  src = fetchFromGitHub {
+    owner = "eggheads";
+    repo = "eggdrop";
+    rev = "9ec109a13c016c4cdc7d52b7e16e4b9b6fbb9331";
+    sha256 = "0mf1vcbmpnvmf5mxk7gi3z32fxpcbynsh9jni8z8frrscrdf5lp5";
+  };
+
+  buildInputs = [ tcl ];
+
+  hardeningDisable = [ "format" ];
+
+  preConfigure = ''
+    prefix=$out/eggdrop
+    mkdir -p $prefix
+  '';
+
+  postConfigure = ''
+    make config
+  '';
+
+  configureFlags = [
+    "--with-tcllib=${tcl}/lib/lib${tcl.libPrefix}${stdenv.hostPlatform.extensions.sharedLibrary}"
+    "--with-tclinc=${tcl}/include/tcl.h"
+  ];
+
+  meta = with stdenv.lib; {
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+  };
+}