* Disable some Haskell packages on Darwin.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15270
This commit is contained in:
Eelco Dolstra 2009-04-23 12:33:09 +00:00
parent f762b50991
commit 49f47f92e3
2 changed files with 7 additions and 12 deletions

View file

@ -1440,11 +1440,7 @@ let
xpf = import ../tools/text/xml/xpf { xpf = import ../tools/text/xml/xpf {
inherit fetchurl stdenv python; inherit fetchurl stdenv python;
libxml2 = libxml2Python;
libxml2 = import ../development/libraries/libxml2 {
inherit fetchurl stdenv zlib python;
pythonSupport = true;
};
}; };
xsel = import ../tools/misc/xsel { xsel = import ../tools/misc/xsel {
@ -3585,15 +3581,14 @@ let
inherit fetchurl stdenv libtool; inherit fetchurl stdenv libtool;
}; };
libxml2 = import ../development/libraries/libxml2 { libxml2 = makeOverridable (import ../development/libraries/libxml2) {
inherit fetchurl stdenv zlib python; inherit fetchurl stdenv zlib python;
pythonSupport = false; pythonSupport = false;
}; };
libxml2Python = lowPrio (appendToName "with-python" (import ../development/libraries/libxml2 { libxml2Python = libxml2.override {
inherit fetchurl stdenv zlib python;
pythonSupport = true; pythonSupport = true;
})); };
libxslt = import ../development/libraries/libxslt { libxslt = import ../development/libraries/libxslt {
inherit fetchurl stdenv libxml2; inherit fetchurl stdenv libxml2;

View file

@ -341,11 +341,11 @@ in {
haskellPackages_ghc6102 = { haskellPackages_ghc6102 = {
darcs = ghcSupported; darcs = ghcSupported;
ghc = ghcSupported; ghc = ghcSupported;
gtk2hs = ghcSupported; gtk2hs = linux;
leksah = ghcSupported; leksah = linux;
lhs2tex = ghcSupported; lhs2tex = ghcSupported;
haskellPlatform = ghcSupported; haskellPlatform = ghcSupported;
xmonad = ghcSupported; xmonad = linux;
}; };
kde3 = { kde3 = {