Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-03-28 15:16:29 +00:00
parent 3f45f0948d c61445357e
commit f60c9df0ba
628 changed files with 60034 additions and 8180 deletions
@@ -13,8 +13,14 @@ stdenv.mkDerivation rec {

  buildInputs = [ tcl ];

+
  hardeningDisable = [ "format" ];

+  patches = [
+    # https://github.com/eggheads/eggdrop/issues/123
+    ./b34a33255f56bbd2317c26da12d702796d67ed50.patch
+  ];
+
  preConfigure = ''
    prefix=$out/eggdrop
    mkdir -p $prefix