diff options
| author | Gabriel Ebner <gebner@gebner.org> | 2020-08-29 13:28:02 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-11-27 13:28:08 +0000 |
| commit | d8e12be3afabf4ce83327f443fb0320c97c09601 (patch) | |
| tree | c6ba2ff428fe2ed187d4de090d2c9e4d25512c2b /nixpkgs/pkgs/development/compilers | |
| parent | 8f196b9f9e0ed36cce7923b8096f645930f4ea92 (diff) | |
| download | nixlib-d8e12be3afabf4ce83327f443fb0320c97c09601.tar nixlib-d8e12be3afabf4ce83327f443fb0320c97c09601.tar.gz nixlib-d8e12be3afabf4ce83327f443fb0320c97c09601.tar.bz2 nixlib-d8e12be3afabf4ce83327f443fb0320c97c09601.tar.lz nixlib-d8e12be3afabf4ce83327f443fb0320c97c09601.tar.xz nixlib-d8e12be3afabf4ce83327f443fb0320c97c09601.tar.zst nixlib-d8e12be3afabf4ce83327f443fb0320c97c09601.zip | |
emscripten: make emconfigure use wrapped binaries
(cherry picked from commit fc0f11e3d533fadbb7d2330b3d3b50bd4eae298e)
Diffstat (limited to 'nixpkgs/pkgs/development/compilers')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/emscripten/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/compilers/emscripten/default.nix b/nixpkgs/pkgs/development/compilers/emscripten/default.nix index ca355ce4fe65..0b43017aa120 100644 --- a/nixpkgs/pkgs/development/compilers/emscripten/default.nix +++ b/nixpkgs/pkgs/development/compilers/emscripten/default.nix @@ -33,8 +33,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ nodejs python3 ]; - outputs = [ "out" "appdir" ]; - buildPhase = '' patchShebangs . @@ -57,10 +55,17 @@ stdenv.mkDerivation rec { # to make the test(s) below work # echo "SPIDERMONKEY_ENGINE = []" >> .emscripten echo "BINARYEN_ROOT = '${binaryen}'" >> .emscripten + + # make emconfigure/emcmake use the correct (wrapped) binaries + sed -i "s|^EMCC =.*|EMCC='$out/bin/emcc'|" tools/shared.py + sed -i "s|^EMXX =.*|EMXX='$out/bin/em++'|" tools/shared.py + sed -i "s|^EMAR =.*|EMAR='$out/bin/emar'|" tools/shared.py + sed -i "s|^EMRANLIB =.*|EMRANLIB='$out/bin/emranlib'|" tools/shared.py ''; installPhase = '' - rm -rf cache + appdir=$out/share/emscripten + mkdir -p $appdir cp -r . $appdir chmod -R +w $appdir |