Author: shlevy
Date: Sun Sep 11 18:28:14 2011
New Revision: 29189
URL: https://ssl.nixos.org/websvn/nix/?rev=29189&sc=1
Log:
Fix evaluation errors for haskellPackages.gtk on darwin. Note that the build is
currently not successful.
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 Sun Sep 11 17:05:48
2011 (r29188)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Sep 11 18:28:14
2011 (r29189)
@@ -434,6 +434,7 @@
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 {};
@@ -601,6 +602,7 @@
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 {};
@@ -616,6 +618,7 @@
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 {};
@@ -891,6 +894,7 @@
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 {};
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
