From d26683f5a98e95a41a3ebf332b7940094c852af1 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 3 Feb 2010 16:12:19 +0000
Subject: [PATCH] Fixed compilation for GLib on FreeBSD

svn path=/nixpkgs/branches/stdenv-updates/; revision=19790
---
 pkgs/development/libraries/glib/2.22.x.nix | 4 ++--
 pkgs/top-level/all-packages.nix            | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/glib/2.22.x.nix b/pkgs/development/libraries/glib/2.22.x.nix
index eaf6a56daded..e6af08cae0e3 100644
--- a/pkgs/development/libraries/glib/2.22.x.nix
+++ b/pkgs/development/libraries/glib/2.22.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gettext, perl }:
+{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv ? null}:
 
 stdenv.mkDerivation rec {
   name = "glib-2.22.4";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "055dv2hymbyzwpcd39r97x747vsvlkyywa826zr75dzambw6n7qd";
   };
 
-  buildInputs = [pkgconfig gettext perl];
+  buildInputs = [pkgconfig gettext perl libiconv];
 
   # The nbd package depends on a static version of this library; hence
   # the default configure flag --disable-static is switched off.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d697b5af82e2..51799fad2b8a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3849,6 +3849,7 @@ let
 
     glib = import ../development/libraries/glib/2.22.x.nix {
       inherit fetchurl stdenv pkgconfig gettext perl;
+      libiconv = if (stdenv.system == "i686-freebsd") then libiconv else null;
     };
 
     glibmm = import ../development/libraries/glibmm/2.22.x.nix {