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
This commit is contained in:
Eric Seidel
2015-02-07 20:29:28 -08:00
parent 362d759750
commit e08b9ab8d3
37 changed files with 88 additions and 114 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libiconvOrNull, recode }:
{ stdenv, fetchurl, libiconv, recode }:
stdenv.mkDerivation rec {
name = "enca-1.16";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0hg7ggldam66l9j53nlrvi2lv1k99r2qfk6dh23vg6mi05cph7bw";
};
buildInputs = [ recode libiconvOrNull ];
buildInputs = [ recode libiconv ];
meta = {
homepage = http://freecode.com/projects/enca;