talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

emscripten: 4.0.11 -> 4.0.12 (#430973)

Browse Source
This commit is contained in:
Will Cohen 2025-08-08 11:45:06 -04:00 committed by GitHub
commit ffb57b96eb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/compilers/emscripten/default.nix
View File

@ -18,7 +18,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "emscripten"; pname = "emscripten";
version = "4.0.11"; version = "4.0.12";
llvmEnv = symlinkJoin { llvmEnv = symlinkJoin {
name = "emscripten-llvm-${version}"; name = "emscripten-llvm-${version}";
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "emscripten-core"; owner = "emscripten-core";
repo = "emscripten"; repo = "emscripten";
hash = "sha256-QNbXgTkzI0fqvg3nU2TAE8A8h6MNMm2TsTzOXBdpqYA="; hash = "sha256-MwCUilfyum1yJb6nHEViYiYWufXlz2+krHZmXw2NAck=";
rev = version; rev = version;
}; };
@ -68,8 +68,8 @@ stdenv.mkDerivation rec {
patchShebangs . patchShebangs .
# emscripten 4 requires LLVM tip-of-tree instead of LLVM 20 # emscripten 4.0.12 requires LLVM tip-of-tree instead of LLVM 21
sed -i -e "s/EXPECTED_LLVM_VERSION = 21/EXPECTED_LLVM_VERSION = 20.1/g" tools/shared.py sed -i -e "s/EXPECTED_LLVM_VERSION = 22/EXPECTED_LLVM_VERSION = 21.1/g" tools/shared.py
# fixes cmake support # fixes cmake support
sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py

2
pkgs/top-level/all-packages.nix
View File

@ -2818,7 +2818,7 @@ with pkgs;
buildEmscriptenPackage = callPackage ../development/em-modules/generic { }; buildEmscriptenPackage = callPackage ../development/em-modules/generic { };
emscripten = callPackage ../development/compilers/emscripten { emscripten = callPackage ../development/compilers/emscripten {
llvmPackages = llvmPackages_20; llvmPackages = llvmPackages_21;
}; };
emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { }); emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { });