diff options
| author | Robin Gloster <mail@glob.in> | 2016-05-30 19:39:34 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-05-30 19:39:34 +0000 |
| commit | 2d382f3d981fc9e4a350badb43736c252415d27c (patch) | |
| tree | 3d5f7a96aa71be52c86f3c243b23424e319cc286 /pkgs/servers/irc | |
| parent | 365379857fb561df949fc841e80458e317a1d682 (diff) | |
| parent | 2661511cdb39bd7612dd5311b46420785fc1eac8 (diff) | |
| download | nixpkgs-2d382f3d981fc9e4a350badb43736c252415d27c.tar nixpkgs-2d382f3d981fc9e4a350badb43736c252415d27c.tar.gz nixpkgs-2d382f3d981fc9e4a350badb43736c252415d27c.tar.bz2 nixpkgs-2d382f3d981fc9e4a350badb43736c252415d27c.tar.lz nixpkgs-2d382f3d981fc9e4a350badb43736c252415d27c.tar.xz nixpkgs-2d382f3d981fc9e4a350badb43736c252415d27c.tar.zst nixpkgs-2d382f3d981fc9e4a350badb43736c252415d27c.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/servers/irc')
| -rw-r--r-- | pkgs/servers/irc/charybdis/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/irc/ircd-hybrid/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index 6ecad81973b..89eeeaecb34 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/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-" ]; diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix index 512cee4b016..603c765854f 100644 --- a/pkgs/servers/irc/ircd-hybrid/default.nix +++ b/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;"; |