@@ -30,7 +30,7 @@ postProcess deriv@(MkDerivation {..})
3030 | pname == "epic" = deriv { extraLibs = "gmp":"boehmgc":extraLibs, buildTools = "happy":buildTools }
3131 | pname == "either" = deriv { runHaddock = True, phaseOverrides = eitherNoHaddock }
3232 | pname == "ghc-heap-view" = deriv { phaseOverrides = ghciPostInstall }
33− | pname == "ghc-mod" = deriv { phaseOverrides = ghcModPostInstall, buildTools = "emacs":buildTools }
33+ | pname == "ghc-mod" = deriv { phaseOverrides = ghcModPostInstall, buildTools = "emacs":"makeWrapper":buildTools }
3434 | pname == "ghc-paths" = deriv { phaseOverrides = ghcPathsPatches }
3535 | pname == "ghc-vis" = deriv { phaseOverrides = ghciPostInstall }
3636 | pname == "git-annex" = deriv { phaseOverrides = gitAnnexOverrides, buildTools = "git":"rsync":"gnupg1":"curl":"lsof":"openssh":"which":"bup":"perl":buildTools }
@@ -152,14 +152,10 @@ ghcModPostInstall = unlines
152152 , " cd .."
153153 , " ensureDir \"$out/share/emacs\""
154154 , " mv $pname-$version emacs/site-lisp"
155− , " mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped"
156− , " cat - > $out/bin/ghc-mod <<EOF"
157− , " #! ${self.stdenv.shell}"
158− , " COMMAND=\\$1"
159− , " shift"
160− , " eval exec $out/bin/.ghc-mod-wrapped \\$COMMAND \\$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr \" \" \"\\n\" | tail -n +2 | paste -d \" \" - - | sed 's/.*/-g \"&\"/' | tr \"\\n\" \" \") \"\\$@\""
161− , " EOF"
162− , " chmod +x $out/bin/ghc-mod"
155+ , " wrapProgram $out/bin/ghc-mod --add-flags \\"
156+ , " \"\\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \\\"\\$(dirname \\$0)\\\" \\\"-g -package-db -g\\\")\""
157+ , " wrapProgram $out/bin/ghc-modi --add-flags \\"
158+ , " \"\\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \\\"\\$(dirname \\$0)\\\" \\\"-g -package-db -g\\\")\""
163159 , "'';"
164160 ]
165161