From 318dc53aa3f8df86a67d05e8e9fa7234f358b399 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 3 Feb 2010 20:20:00 +0000
Subject: [PATCH] Fixed dbus-glib compilation on FreeBSD

svn path=/nixpkgs/branches/stdenv-updates/; revision=19793
---
 pkgs/development/libraries/dbus-glib/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix
index 752ded6320b2..a6d594af0f02 100644
--- a/pkgs/development/libraries/dbus-glib/default.nix
+++ b/pkgs/development/libraries/dbus-glib/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0nv4gxcbpa9f0907dmzmfm222w8y45z19cx27l85f5qknf8hncxm";
   };
   
-  buildInputs = [pkgconfig expat gettext];
+  buildInputs = [pkgconfig expat gettext libiconv];
   
   propagatedBuildInputs = [dbus.libs glib];
   
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51799fad2b8a..32571c953564 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3419,6 +3419,7 @@ let
 
   dbus_glib = makeOverridable (import ../development/libraries/dbus-glib) {
     inherit fetchurl stdenv pkgconfig gettext dbus expat glib;
+    libiconv = if (stdenv.system == "i686-freebsd") then libiconv else null;
   };
 
   dbus_java = import ../development/libraries/java/dbus-java {