ghcjs-ng: Move to $out/lib/ghcjs-8.4

This is standard for ghc compilers & much more convenient. This seems
to fix the issues we have been having in ghcjs pkgs.

Fixes #42032
Fixes #42617
This commit is contained in:
Matthew Bauer
2018-06-26 16:34:03 -04:00
parent c5cb7e550e
commit e01db49bfa
2 changed files with 7 additions and 6 deletions

View File

@@ -80,12 +80,12 @@ in stdenv.mkDerivation {
cd lib/boot
mkdir -p $out/bin
mkdir -p $out/libexec
mkdir -p $out/lib/${bootGhcjs.name}
lndir ${libexec} $out/bin
wrapProgram $out/bin/ghcjs --add-flags "-B$out/libexec"
wrapProgram $out/bin/haddock-ghcjs --add-flags "-B$out/libexec"
wrapProgram $out/bin/ghcjs-pkg --add-flags "--global-package-db=$out/libexec/package.conf.d"
wrapProgram $out/bin/ghcjs --add-flags "-B$out/lib/${bootGhcjs.name}"
wrapProgram $out/bin/haddock-ghcjs --add-flags "-B$out/lib/${bootGhcjs.name}"
wrapProgram $out/bin/ghcjs-pkg --add-flags "--global-package-db=$out/lib/${bootGhcjs.name}/package.conf.d"
env PATH=$out/bin:$PATH $out/bin/ghcjs-boot -j1 --with-ghcjs-bin $out/bin
'';