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/development/libraries/dbus-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/dbus-glib') diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 80afcb343ddd1..16a20ec94a4d1 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, expat, gettext, libiconvOrEmpty, dbus, glib }: +{ stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }: stdenv.mkDerivation rec { name = "dbus-glib-0.102"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext ]; - buildInputs = [ expat ] ++ libiconvOrEmpty; + buildInputs = [ expat libiconv ]; propagatedBuildInputs = [ dbus.libs glib ]; -- cgit 1.4.1