From d53cb937f5e8489f40cb09b9a7fc1749159f7f5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 21 Aug 2012 15:29:37 +0200
Subject: [PATCH] libiconvOrNull: Do not use an external libiconv on glibc
 systems.

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 485f28f1d9c..17d303c5db4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4146,7 +4146,7 @@ let
 
   libiconvOrEmpty = if (libiconvOrNull == null) then [] else libiconv;
 
-  libiconvOrNull = if gcc ? libc then null else libiconv;
+  libiconvOrNull = if ((gcc ? libc) || stdenv.isGlibc) then null else libiconv;
 
   libiconvOrLibc = if (libiconvOrNull == null) then gcc.libc else libiconv;