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

pkgs/servers/irc/charybdis/default.nix

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-epoll"
     "--enable-ipv6"
-    "--enable-openssl=${openssl}"
+    "--enable-openssl=${openssl.dev}"
     "--with-program-prefix=charybdis-"
   ];
 

pkgs/servers/irc/ircd-hybrid/default.nix

@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   buildInputs = [ openssl zlib ];
 
   configureFlags =
-    "--with-nicklen=100 --with-topiclen=360 --enable-openssl=${openssl}";
+    "--with-nicklen=100 --with-topiclen=360 --enable-openssl=${openssl.dev}";
 
   postInstall = "echo postinstall; mkdir -p \${out}/ ; rm -rf \${out}/logs ; ln -s /home/ircd \${out}/logs;";