diff options
| author | Alastair Pharo <asppsa@gmail.com> | 2018-03-21 01:45:19 +1100 |
|---|---|---|
| committer | Joachim Schiele <js@lastlog.de> | 2018-03-20 15:45:19 +0100 |
| commit | 497e50cf161f2873490e19ae392553f6d2bdcac3 (patch) | |
| tree | fb7d64f9f6544f37b5d66ccf6b30442d31a6c37b /pkgs/development/compilers/emscripten | |
| parent | 06828573e7009ed3c2cfebe67e72871acf691a18 (diff) | |
emscripten: use matching binaryen version (#37427)
This changes the emscripten package so that it specifies the rev from
the binaryen repo to use, and sets it to always use the version that has
been tagged for use with that version of emscripten. This should force
future updates of emscripten to also update binaryen.
Binaryen can also be installed as a stand-alone package, so there's some
logic added to the binaryen package to allow building in both ways, and
distinguishing between them.
Diffstat (limited to 'pkgs/development/compilers/emscripten')
| -rw-r--r-- | pkgs/development/compilers/emscripten/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index ac972c99a959..8e268aa7eb74 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -5,6 +5,7 @@ let rev = emscriptenVersion; appdir = "share/emscripten"; + binaryenVersioned = binaryen.override { emscriptenRev = rev; }; in stdenv.mkDerivation { @@ -44,7 +45,7 @@ stdenv.mkDerivation { echo "SPIDERMONKEY_ENGINE = []" >> $out/${appdir}/config '' + stdenv.lib.optionalString enableWasm '' - echo "BINARYEN_ROOT = '${binaryen}'" >> $out/share/emscripten/config + echo "BINARYEN_ROOT = '${binaryenVersioned}'" >> $out/share/emscripten/config '' + '' |