about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2011-09-09 19:57:44 +0000
committerPeter Simons <simons@cryp.to>2011-09-09 19:57:44 +0000
commit4e6013e90962a6638802f0b628898e8a7a462139 (patch)
tree6220fc9e47fc80261b80b9fc02ecf7140d68aa2f
parent19995681f36b040456e2442859563bb02bf62a10 (diff)
downloadnixlib-4e6013e90962a6638802f0b628898e8a7a462139.tar
nixlib-4e6013e90962a6638802f0b628898e8a7a462139.tar.gz
nixlib-4e6013e90962a6638802f0b628898e8a7a462139.tar.bz2
nixlib-4e6013e90962a6638802f0b628898e8a7a462139.tar.lz
nixlib-4e6013e90962a6638802f0b628898e8a7a462139.tar.xz
nixlib-4e6013e90962a6638802f0b628898e8a7a462139.tar.zst
nixlib-4e6013e90962a6638802f0b628898e8a7a462139.zip
haskell-gtk still fails an assertion on Darwin; my attempt to fix that
hasn't worked, so I revert the change. Someone with access to that
platform will have to worry about those on Hydra assertions, I'm afraid.

svn path=/nixpkgs/trunk/; revision=29143
-rw-r--r--pkgs/top-level/haskell-packages.nix1
1 files changed, 0 insertions, 1 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 20f816d81e8c..f7f15dec07ab 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -616,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.isLinux then pkgs.stdenv.glibc else null;
   };
 
   gtk2hsBuildtools = callPackage ../development/libraries/haskell/gtk2hs-buildtools {};