[Nix-commits] SVN commit: nix - r29223 - nixpkgs/trunk/pkgs/top-level

[Peter Simons]

Author: simons
Date: Mon Sep 12 16:46:14 2011
New Revision: 29223
URL: https://ssl.nixos.org/websvn/nix/?rev=29223&sc=1

Log:
Haskell packages that require access to libc (for <time.h>, etc.)
consistently depend on the (non-existent) attribute 'libc'. That
dependency is then fulfilled by defining

  libc = pkgs.stdenv.gcc.libc;

in haskell-packages.nix where appropriate. On platforms impure platforms,
such as Darwin, that attribute evaluates to 'null'.

Modified:
   nixpkgs/trunk/pkgs/top-level/haskell-packages.nix

Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Mon Sep 12 16:46:10 
2011        (r29222)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Mon Sep 12 16:46:14 
2011        (r29223)
@@ -434,6 +434,7 @@
 
   cairo = callPackage ../development/libraries/haskell/cairo {
     inherit (pkgs) cairo zlib;
+    libc = pkgs.stdenv.gcc.libc;
   };
 
   caseInsensitive = callPackage 
../development/libraries/haskell/case-insensitive {};
@@ -595,10 +596,12 @@
   glade = callPackage ../development/libraries/haskell/glade {
     inherit (pkgs.gnome) libglade;
     gtkC = pkgs.gnome.gtk;
+    libc = pkgs.stdenv.gcc.libc;
   };
 
   glib = callPackage ../development/libraries/haskell/glib {
     glib = pkgs.glib;
+    libc = pkgs.stdenv.gcc.libc;
   };
 
   GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {};
@@ -614,6 +617,7 @@
 
   gtk = callPackage ../development/libraries/haskell/gtk {
     inherit (pkgs.gtkLibs) gtk;
+    libc = pkgs.stdenv.gcc.libc;
   };
 
   gtk2hsBuildtools = callPackage 
../development/libraries/haskell/gtk2hs-buildtools {};
@@ -621,6 +625,7 @@
 
   gtksourceview2 = callPackage ../development/libraries/haskell/gtksourceview2 
{
     inherit (pkgs.gnome) gtksourceview;
+    libc = pkgs.stdenv.gcc.libc;
   };
 
   Graphalyze = callPackage ../development/libraries/haskell/Graphalyze {};
@@ -889,6 +894,7 @@
 
   pango = callPackage ../development/libraries/haskell/pango {
     inherit (pkgs.gtkLibs) pango;
+    libc = pkgs.stdenv.gcc.libc;
   };
 
   parallel_1_1_0_1 = callPackage 
../development/libraries/haskell/parallel/1.1.0.1.nix {};
@@ -1097,7 +1103,9 @@
 
   strictConcurrency = callPackage 
../development/libraries/haskell/strictConcurrency {};
 
-  svgcairo = callPackage ../development/libraries/haskell/svgcairo {};
+  svgcairo = callPackage ../development/libraries/haskell/svgcairo {
+    libc = pkgs.stdenv.gcc.libc;
+  };
 
   systemFilepath = callPackage 
../development/libraries/haskell/system-filepath {};
 
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits