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'. svn path=/nixpkgs/trunk/; revision=29223
This commit is contained in:
parent
631772e028
commit
c88d870123
@ -434,6 +434,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||||||
|
|
||||||
cairo = callPackage ../development/libraries/haskell/cairo {
|
cairo = callPackage ../development/libraries/haskell/cairo {
|
||||||
inherit (pkgs) cairo zlib;
|
inherit (pkgs) cairo zlib;
|
||||||
|
libc = pkgs.stdenv.gcc.libc;
|
||||||
};
|
};
|
||||||
|
|
||||||
caseInsensitive = callPackage ../development/libraries/haskell/case-insensitive {};
|
caseInsensitive = callPackage ../development/libraries/haskell/case-insensitive {};
|
||||||
@ -595,10 +596,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||||||
glade = callPackage ../development/libraries/haskell/glade {
|
glade = callPackage ../development/libraries/haskell/glade {
|
||||||
inherit (pkgs.gnome) libglade;
|
inherit (pkgs.gnome) libglade;
|
||||||
gtkC = pkgs.gnome.gtk;
|
gtkC = pkgs.gnome.gtk;
|
||||||
|
libc = pkgs.stdenv.gcc.libc;
|
||||||
};
|
};
|
||||||
|
|
||||||
glib = callPackage ../development/libraries/haskell/glib {
|
glib = callPackage ../development/libraries/haskell/glib {
|
||||||
glib = pkgs.glib;
|
glib = pkgs.glib;
|
||||||
|
libc = pkgs.stdenv.gcc.libc;
|
||||||
};
|
};
|
||||||
|
|
||||||
GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {};
|
GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {};
|
||||||
@ -614,6 +617,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||||||
|
|
||||||
gtk = callPackage ../development/libraries/haskell/gtk {
|
gtk = callPackage ../development/libraries/haskell/gtk {
|
||||||
inherit (pkgs.gtkLibs) gtk;
|
inherit (pkgs.gtkLibs) gtk;
|
||||||
|
libc = pkgs.stdenv.gcc.libc;
|
||||||
};
|
};
|
||||||
|
|
||||||
gtk2hsBuildtools = callPackage ../development/libraries/haskell/gtk2hs-buildtools {};
|
gtk2hsBuildtools = callPackage ../development/libraries/haskell/gtk2hs-buildtools {};
|
||||||
@ -621,6 +625,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||||||
|
|
||||||
gtksourceview2 = callPackage ../development/libraries/haskell/gtksourceview2 {
|
gtksourceview2 = callPackage ../development/libraries/haskell/gtksourceview2 {
|
||||||
inherit (pkgs.gnome) gtksourceview;
|
inherit (pkgs.gnome) gtksourceview;
|
||||||
|
libc = pkgs.stdenv.gcc.libc;
|
||||||
};
|
};
|
||||||
|
|
||||||
Graphalyze = callPackage ../development/libraries/haskell/Graphalyze {};
|
Graphalyze = callPackage ../development/libraries/haskell/Graphalyze {};
|
||||||
@ -889,6 +894,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||||||
|
|
||||||
pango = callPackage ../development/libraries/haskell/pango {
|
pango = callPackage ../development/libraries/haskell/pango {
|
||||||
inherit (pkgs.gtkLibs) 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 {};
|
parallel_1_1_0_1 = callPackage ../development/libraries/haskell/parallel/1.1.0.1.nix {};
|
||||||
@ -1097,7 +1103,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||||||
|
|
||||||
strictConcurrency = callPackage ../development/libraries/haskell/strictConcurrency {};
|
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 {};
|
systemFilepath = callPackage ../development/libraries/haskell/system-filepath {};
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user