diff options
| author | Will Cohen <willcohen@users.noreply.github.com> | 2022-06-22 15:15:18 -0400 |
|---|---|---|
| committer | Will Cohen <willcohen@users.noreply.github.com> | 2022-06-23 11:14:54 -0400 |
| commit | 4df8e6fc952fd7fefb3e81e154bfd4f497073a29 (patch) | |
| tree | 9e3a094fdcc06edf47507accd3fc6c88f42267fd /pkgs/development/compilers/emscripten | |
| parent | 995b0ffd9c0040d98fe2a494fa6bc6060ae54411 (diff) | |
emscripten: 3.1.12 -> 3.1.14
Diffstat (limited to 'pkgs/development/compilers/emscripten')
| -rw-r--r-- | pkgs/development/compilers/emscripten/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/compilers/emscripten/package.json | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 9424a8506670..0a99fa170b77 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -3,12 +3,11 @@ , llvmPackages , symlinkJoin, makeWrapper, substituteAll , mkYarnModules -, fetchpatch }: stdenv.mkDerivation rec { pname = "emscripten"; - version = "3.1.12"; + version = "3.1.14"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -27,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - sha256 = "sha256-lZ5U6e1UNd1Yvxp+k9eLsgwGXz/0WKisuhudUQf+pu0="; + sha256 = "sha256-CVFC278ibwUMib2F64Uc7FP+D1JPUJ/9/3w0wz1PWqg="; rev = version; }; @@ -39,11 +38,6 @@ stdenv.mkDerivation rec { src = ./0001-emulate-clang-sysroot-include-logic.patch; resourceDir = "${llvmEnv}/lib/clang/${llvmPackages.release_version}/"; }) - (fetchpatch { - # https://github.com/emscripten-core/emscripten/pull/16986 - url = "https://github.com/emscripten-core/emscripten/commit/d5ef6937fe395488e23a82c1e582a7ea5c2dab83.patch"; - sha256 = "sha256-YX5DG8i5x6S7XnU58etEapDd+o5SuzbFIGv8v/9+T3E="; - }) ]; buildPhase = '' @@ -98,7 +92,7 @@ stdenv.mkDerivation rec { # precompile libc (etc.) in all variants: pushd $TMPDIR - echo 'int main() { return 42; }' >test.c + echo 'int __main_argc_argv() { return 42; }' >test.c for LTO in -flto ""; do # wasm2c doesn't work with PIC $out/bin/emcc -s WASM2C -s STANDALONE_WASM $LTO test.c diff --git a/pkgs/development/compilers/emscripten/package.json b/pkgs/development/compilers/emscripten/package.json index 8f3e09b5cbde..dfd416c3b5a6 100644 --- a/pkgs/development/compilers/emscripten/package.json +++ b/pkgs/development/compilers/emscripten/package.json @@ -1,6 +1,6 @@ { "name": "emscripten", - "version": "3.1.12", + "version": "3.1.14", "private": true, "devDependencies": { "es-check": "^6.2.1", |