diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-18 15:23:00 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-18 15:23:00 +0000 |
| commit | baad5d7cb4ee715fe0743a6b160096f1515641fe (patch) | |
| tree | d4c3267deddd4bb8fcde259412fd021de29d9607 /pkgs/top-level | |
| parent | 9c509e25835fb29cb29c72ef1bea7722c96c07fa (diff) | |
* GHC setup hook: don't generate wrappers around ghc etc., instead
set GHC_PACKAGE_PATH. * Let Cabal generate a package configuration file ($out/nix-support/ghc-package.conf) instead of a registration script. svn path=/nixpkgs/trunk/; revision=15127
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7e599a5acdeb7..31200d6bd8bd6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -113,8 +113,8 @@ rec { # Compilers. ehc = import ../development/compilers/ehc { - inherit ghc; - inherit (pkgs) fetchsvn stdenv coreutils m4 libtool uulib uuagc llvm; + inherit ghc uulib uuagc; + inherit (pkgs) fetchsvn stdenv coreutils m4 libtool llvm; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 9bfb1d65109be..a2601c14ce06c 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -293,7 +293,6 @@ in { wget = all; wine = ["i686-linux"]; wirelesstools = linux; - wxHaskell = linux; x11_ssh_askpass = linux; xchm = linux; xfig = x11Supported; |