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
2015-02-07 20:29:28 -08:00
parent 362d759750
commit e08b9ab8d3
37 changed files with 88 additions and 114 deletions
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, flex, bison, libxslt
-, glib, libiconvOrEmpty, libintlOrEmpty
+, glib, libiconv, libintlOrEmpty
 }:

 let
@@ -25,7 +25,6 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ pkgconfig flex bison libxslt ];

-  buildInputs = [ glib ]
-    ++ libiconvOrEmpty
+  buildInputs = [ glib libiconv ]
    ++ libintlOrEmpty;
 }
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, flex, bison, libxslt
-, glib, libiconvOrEmpty, libintlOrEmpty
+, glib, libiconv, libintlOrEmpty
 }:

 let
@@ -25,7 +25,6 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ pkgconfig flex bison libxslt ];

-  buildInputs = [ glib ]
-    ++ libiconvOrEmpty
+  buildInputs = [ glib libiconv ]
    ++ libintlOrEmpty;
 }