diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-26 16:34:03 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-26 17:43:58 -0400 |
| commit | e01db49bfa43b0016229150fa19c9967677a808c (patch) | |
| tree | b00bd9d11e81e8b91a6f0059fccc1336326be105 /pkgs/development/compilers | |
| parent | c5cb7e550ef0bf0438240f6998afffc64b3c3fa7 (diff) | |
| download | nixlib-e01db49bfa43b0016229150fa19c9967677a808c.tar nixlib-e01db49bfa43b0016229150fa19c9967677a808c.tar.gz nixlib-e01db49bfa43b0016229150fa19c9967677a808c.tar.bz2 nixlib-e01db49bfa43b0016229150fa19c9967677a808c.tar.lz nixlib-e01db49bfa43b0016229150fa19c9967677a808c.tar.xz nixlib-e01db49bfa43b0016229150fa19c9967677a808c.tar.zst nixlib-e01db49bfa43b0016229150fa19c9967677a808c.zip | |
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
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/ghcjs-ng/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 65b43f712ae2..9aa3efe614eb 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -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 ''; |