From 1165fdd247591189da0c310bb14c30530982e152 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 24 Jun 2006 11:16:29 +0000 Subject: [PATCH] * More fixes. svn path=/nixpkgs/trunk/; revision=5513 --- pkgs/development/compilers/ghc-wrapper/builder.sh | 2 ++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc-wrapper/builder.sh b/pkgs/development/compilers/ghc-wrapper/builder.sh index 0d774e8a7d56..9851f9b2b1b6 100644 --- a/pkgs/development/compilers/ghc-wrapper/builder.sh +++ b/pkgs/development/compilers/ghc-wrapper/builder.sh @@ -1,5 +1,7 @@ source $stdenv/setup +export HOME=$(pwd)/fake-home + makeWrapper() { wrapperBase="$1" wrapperName="$2" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19b06af22073..156fa76718fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -805,9 +805,11 @@ rec { }; transformers = (import ../development/compilers/transformers) { - inherit fetchurl stdenv pkgconfig sdf; + inherit fetchurl pkgconfig sdf; aterm = aterm23x; + stdenv = overrideGCC (overrideInStdenv stdenv [gnumake380]) gcc34; + strategoxt = (import ../development/compilers/strategoxt/strategoxt-0.14.nix) { inherit fetchurl pkgconfig sdf; aterm = aterm23x;