From 2c096bf75fa2e91d94dcfcd0537a669d8e119a2e Mon Sep 17 00:00:00 2001 From: Andres Löh Date: Thu, 28 May 2009 19:06:29 +0000 Subject: Fix the ghc-wrapper in order to enable runghc/runhaskell. svn path=/nixpkgs/trunk/; revision=15774 --- pkgs/development/compilers/ghc/wrapper.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pkgs/development/compilers/ghc') diff --git a/pkgs/development/compilers/ghc/wrapper.nix b/pkgs/development/compilers/ghc/wrapper.nix index 5cacfdf8f894..7d37cba6efed 100644 --- a/pkgs/development/compilers/ghc/wrapper.nix +++ b/pkgs/development/compilers/ghc/wrapper.nix @@ -11,9 +11,12 @@ stdenv.mkDerivation { ensureDir $out/bin cp $GHCGetPackages $out/bin/ghc-get-packages.sh chmod 755 $out/bin/ghc-get-packages.sh - for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version} runghc runhaskell; do + for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version}; do makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$($out/bin/ghc-get-packages.sh ${ghc.version} \"\$(dirname \$0)\")" done + for prg in runghc runhaskell; do + makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$($out/bin/ghc-get-packages.sh ${ghc.version} \"\$(dirname \$0)\" \" -package-conf --ghc-arg=\")" + done for prg in ghc-pkg ghc-pkg-${ghc.version}; do makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$($out/bin/ghc-get-packages.sh ${ghc.version} \"\$(dirname \$0)\" --package-conf=)" done -- cgit 1.4.1