From 311c6c66bf784a1f0f61b263a8f8f6d5f3e9efb6 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 3 Nov 2014 15:30:53 -0600 Subject: [PATCH] Undo some changes only appropriate for the clang fork --- pkgs/top-level/haskell-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a5036f6e4a51..14907006d3e2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -367,7 +367,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in }; cairo_0_13_0_4 = callPackage ../development/libraries/haskell/cairo/0.13.0.4.nix { inherit (pkgs) cairo zlib; - libc = pkgs.stdenv.cc.libc; + libc = pkgs.stdenv.gcc.libc; }; cairo = self.cairo_0_13_0_4; @@ -977,7 +977,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in }; glib_0_13_0_5 = callPackage ../development/libraries/haskell/glib/0.13.0.5.nix { glib = pkgs.glib; - libc = pkgs.stdenv.cc.libc; + libc = pkgs.stdenv.gcc.libc; }; glib = self.glib_0_13_0_5; @@ -1039,7 +1039,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in }; gtk_0_13_0_3 = callPackage ../development/libraries/haskell/gtk/0.13.0.3.nix { inherit (pkgs) gtk; - libc = pkgs.stdenv.cc.libc; + libc = pkgs.stdenv.gcc.libc; }; gtk = self.gtk_0_13_0_3; @@ -1916,7 +1916,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pango_0_12_5_3 = callPackage ../development/libraries/haskell/pango/0.12.5.3.nix { inherit (pkgs) pango; - libc = pkgs.stdenv.cc.libc; + libc = pkgs.stdenv.gcc.libc; glib = self.glib_0_12_5_4; cairo = self.cairo_0_12_5_3; };