From e08b9ab8d3d6362c774a786797347fa7483af773 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Wed, 26 Nov 2014 15:16:50 -0800 Subject: kill libiconvOr* Conflicts: pkgs/applications/networking/mailreaders/sup/default.nix pkgs/development/compilers/ghc/7.8.3-binary.nix pkgs/development/interpreters/php/5.3.nix pkgs/development/interpreters/ruby/patches.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/poppler/default.nix pkgs/top-level/all-packages.nix --- pkgs/servers/irc/ngircd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/servers/irc') diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/servers/irc/ngircd/default.nix index 738881e2aafe..50bc86e805e0 100644 --- a/pkgs/servers/irc/ngircd/default.nix +++ b/pkgs/servers/irc/ngircd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, openssl, pam, libiconvOrNull }: +{ stdenv, fetchurl, zlib, openssl, pam, libiconv }: stdenv.mkDerivation rec { name = "ngircd-21"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "--with-iconv" ]; - buildInputs = [ zlib pam openssl libiconvOrNull ]; + buildInputs = [ zlib pam openssl libiconv ]; meta = { description = "Next Generation IRC Daemon"; -- cgit v1.2.3