about summary refs log tree commit diff
path: root/pkgs/development/compilers/ghc
diff options
context:
space:
mode:
authorAndres Löh <mail@andres-loeh.de>2009-05-28 19:06:29 +0000
committerAndres Löh <mail@andres-loeh.de>2009-05-28 19:06:29 +0000
commit2c096bf75fa2e91d94dcfcd0537a669d8e119a2e (patch)
tree4c59bdfe14c4b911dd8a6e8601513c8f1af8b98b /pkgs/development/compilers/ghc
parent58b4add4e6c952b34dca68ac8761472b0d707145 (diff)
downloadnixlib-2c096bf75fa2e91d94dcfcd0537a669d8e119a2e.tar
nixlib-2c096bf75fa2e91d94dcfcd0537a669d8e119a2e.tar.gz
nixlib-2c096bf75fa2e91d94dcfcd0537a669d8e119a2e.tar.bz2
nixlib-2c096bf75fa2e91d94dcfcd0537a669d8e119a2e.tar.lz
nixlib-2c096bf75fa2e91d94dcfcd0537a669d8e119a2e.tar.xz
nixlib-2c096bf75fa2e91d94dcfcd0537a669d8e119a2e.tar.zst
nixlib-2c096bf75fa2e91d94dcfcd0537a669d8e119a2e.zip
Fix the ghc-wrapper in order to enable runghc/runhaskell.
svn path=/nixpkgs/trunk/; revision=15774
Diffstat (limited to 'pkgs/development/compilers/ghc')
-rw-r--r--pkgs/development/compilers/ghc/wrapper.nix5
1 files changed, 4 insertions, 1 deletions
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