public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell-ghc-mod: revert "wrap the newly added ghc-modi executable"

Browse Source 
This reverts commit eba689ad05145a84e088bfe52543453ad60d657e. ghc-modi
stopped working for me after this change.

https://github.com/NixOS/nixpkgs/pull/2490
This commit is contained in:
Peter Simons 2014-05-04 14:05:05 +02:00
parent 80d39a273e
commit 9e5f7ada34
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/haskell/ghc-mod/default.nix
View File

@ -26,16 +26,14 @@ cabal.mkDerivation (self: {
cd .. cd ..
ensureDir "$out/share/emacs" ensureDir "$out/share/emacs"
mv $pname-$version emacs/site-lisp mv $pname-$version emacs/site-lisp
for prog in ghc-mod ghc-modi; do mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped
mv $out/bin/$prog $out/bin/.$prog-wrapped cat - > $out/bin/ghc-mod <<EOF
cat - > $out/bin/$prog <<EOF
#! ${self.stdenv.shell} #! ${self.stdenv.shell}
COMMAND=\$1 COMMAND=\$1
shift shift
eval exec $out/bin/.$prog-wrapped \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@" 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" " ") "\$@"
EOF EOF
chmod +x $out/bin/$prog chmod +x $out/bin/ghc-mod
done
''; '';
meta = { meta = {
homepage = "http://www.mew.org/~kazu/proj/ghc-mod/"; homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";