From d1808a89d3c8a6ad4c0d666de8e64d53e8d15c98 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 11 Sep 2011 18:48:46 +0000
Subject: [PATCH] haskellPackages.{cairo,pango,glib,gtk}: Depend on the stdenv
 libc instead of glibc

svn path=/nixpkgs/trunk/; revision=29190
---
 pkgs/development/libraries/haskell/cairo/default.nix | 4 ++--
 pkgs/development/libraries/haskell/glib/default.nix  | 4 ++--
 pkgs/development/libraries/haskell/gtk/default.nix   | 4 ++--
 pkgs/development/libraries/haskell/pango/default.nix | 4 ++--
 pkgs/top-level/haskell-packages.nix                  | 4 ----
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix
index 293f692c67f..24f2319c842 100644
--- a/pkgs/development/libraries/haskell/cairo/default.nix
+++ b/pkgs/development/libraries/haskell/cairo/default.nix
@@ -1,4 +1,4 @@
-{ cabal, cairo, glibc, gtk2hsBuildtools, mtl, pkgconfig, zlib }:
+{ cabal, cairo, gtk2hsBuildtools, mtl, pkgconfig, zlib }:
 
 cabal.mkDerivation (self: {
   pname = "cairo";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "0n2sqbf8wjjvm5m1igkq685vqvc0lil3gmcs3i0g9hy7lsjnlwr9";
   buildDepends = [ mtl ];
   buildTools = [ gtk2hsBuildtools ];
-  extraLibraries = [ cairo glibc pkgconfig zlib ];
+  extraLibraries = [ cairo self.stdenv.gcc.libc pkgconfig zlib ];
   pkgconfigDepends = [ cairo ];
   meta = {
     homepage = "http://www.haskell.org/gtk2hs/";
diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix
index 9d7750e24de..6c685812846 100644
--- a/pkgs/development/libraries/haskell/glib/default.nix
+++ b/pkgs/development/libraries/haskell/glib/default.nix
@@ -1,11 +1,11 @@
-{ cabal, glib, glibc, gtk2hsBuildtools, pkgconfig }:
+{ cabal, glib, gtk2hsBuildtools, pkgconfig }:
 
 cabal.mkDerivation (self: {
   pname = "glib";
   version = "0.12.0";
   sha256 = "1sqkj6adg87ccdnl9yy1p8yrv5xnfcrlaflj52nrh6anwlqy9z19";
   buildTools = [ gtk2hsBuildtools ];
-  extraLibraries = [ glibc pkgconfig ];
+  extraLibraries = [ self.stdenv.gcc.libc pkgconfig ];
   pkgconfigDepends = [ glib ];
   meta = {
     homepage = "http://www.haskell.org/gtk2hs/";
diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix
index 0b9cd20eb0a..41b72975eb1 100644
--- a/pkgs/development/libraries/haskell/gtk/default.nix
+++ b/pkgs/development/libraries/haskell/gtk/default.nix
@@ -1,4 +1,4 @@
-{ cabal, cairo, glib, glibc, gtk, gtk2hsBuildtools, mtl, pango
+{ cabal, cairo, glib, gtk, gtk2hsBuildtools, mtl, pango
 , pkgconfig
 }:
 
@@ -8,7 +8,7 @@ cabal.mkDerivation (self: {
   sha256 = "1rqy0390rahdrlb1ba1hjrygwin8ynxzif5flcici22bg5ixsgs2";
   buildDepends = [ cairo glib mtl pango ];
   buildTools = [ gtk2hsBuildtools ];
-  extraLibraries = [ glibc pkgconfig ];
+  extraLibraries = [ self.stdenv.gcc.libc pkgconfig ];
   pkgconfigDepends = [ glib gtk ];
   meta = {
     homepage = "http://www.haskell.org/gtk2hs/";
diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix
index aff6bdb7315..7e1f3c933ba 100644
--- a/pkgs/development/libraries/haskell/pango/default.nix
+++ b/pkgs/development/libraries/haskell/pango/default.nix
@@ -1,4 +1,4 @@
-{ cabal, cairo, glib, glibc, gtk2hsBuildtools, mtl, pango
+{ cabal, cairo, glib, gtk2hsBuildtools, mtl, pango
 , pkgconfig
 }:
 
@@ -8,7 +8,7 @@ cabal.mkDerivation (self: {
   sha256 = "1vp0hl4kpgcc3xphml1hmy04hqcn12y0ks03nn32g6g33ni9mwrb";
   buildDepends = [ cairo glib mtl ];
   buildTools = [ gtk2hsBuildtools ];
-  extraLibraries = [ glibc pkgconfig ];
+  extraLibraries = [ self.stdenv.gcc.libc pkgconfig ];
   pkgconfigDepends = [ cairo pango ];
   meta = {
     homepage = "http://www.haskell.org/gtk2hs/";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6f7501f505d..934ec4c0b69 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -434,7 +434,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   cairo = callPackage ../development/libraries/haskell/cairo {
     inherit (pkgs) cairo zlib;
-    glibc = if pkgs.stdenv.isDarwin then null else pkgs.glibc;
   };
 
   caseInsensitive_0_3 = callPackage ../development/libraries/haskell/case-insensitive/0.3.nix {};
@@ -602,7 +601,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   glib = callPackage ../development/libraries/haskell/glib {
     glib = pkgs.glib;
-    glibc = if pkgs.stdenv.isDarwin then null else pkgs.glibc;
   };
 
   GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {};
@@ -618,7 +616,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   gtk = callPackage ../development/libraries/haskell/gtk {
     inherit (pkgs.gtkLibs) gtk;
-    glibc = if pkgs.stdenv.isDarwin then null else pkgs.glibc;
   };
 
   gtk2hsBuildtools = callPackage ../development/libraries/haskell/gtk2hs-buildtools {};
@@ -894,7 +891,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   pango = callPackage ../development/libraries/haskell/pango {
     inherit (pkgs.gtkLibs) pango;
-    glibc = if pkgs.stdenv.isDarwin then null else pkgs.glibc;
   };
 
   parallel_1_1_0_1 = callPackage ../development/libraries/haskell/parallel/1.1.0.1.nix {};