Unverified Commit 0f540172 authored by Will Cohen's avatar Will Cohen Committed by GitHub
Browse files

emscripten: 4.0.23 -> 5.0.0 (#489359)

parents 1bf59624 b80d3415

pkgs/development/compilers/emscripten/default.nix

+5 −17
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ in 


stdenv.mkDerivation rec {

  pname = "emscripten";

  version = "4.0.23";

  version = "5.0.0";



  llvmEnv = symlinkJoin {

    name = "emscripten-llvm-${version}";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec { 
    name = "emscripten-node-modules-${version}";

    inherit pname version src;



    npmDepsHash = "sha256-3P4H30nS6RBe2Bd3aqa2ueLOm/hxSBux53GgJu/D4Xc=";

    npmDepsHash = "sha256-0erImaY5NixdzgazKI6JQ3mofGU+ZwMxMWh0zIcWdhY=";



    dontBuild = true;
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec { 
  src = fetchFromGitHub {

    owner = "emscripten-core";

    repo = "emscripten";

    hash = "sha256-i65AWbKuh2KsnugGKmmpUON20He2kgPR6EzwKKA09nQ=";

    hash = "sha256-Ff1SJ+zaKb77Qa2D9Yn0f1KGKNNF8DpslfNF2fFlrXw=";

    rev = version;

  };
@@ -79,12 +79,8 @@ stdenv.mkDerivation rec { 


        patchShebangs .



        # emscripten 4.0.12 requires LLVM tip-of-tree instead of LLVM 21

        sed -i -e "s/EXPECTED_LLVM_VERSION = 22/EXPECTED_LLVM_VERSION = 21.1/g" tools/shared.py



        # Verify LLVM version patch was applied (fail when nixpkgs has LLVM 22+)

        grep -q "EXPECTED_LLVM_VERSION = 21.1" tools/shared.py || \

          (echo "ERROR: LLVM version patch failed - check if still needed" && exit 1)

        # emscripten 5.0.0 expects LLVM tip-of-tree instead of LLVM 22

        sed -i -e "s/EXPECTED_LLVM_VERSION = 23/EXPECTED_LLVM_VERSION = 22/g" tools/shared.py



        # fixes cmake support

        sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py
@@ -107,14 +103,6 @@ stdenv.mkDerivation rec { 
        sed -i "s|^EMAR =.*|EMAR='$out/bin/emar'|" tools/shared.py

        sed -i "s|^EMRANLIB =.*|EMRANLIB='$out/bin/emranlib'|" tools/shared.py



        # Remove --no-stack-first flag (not in LLVM 21, added in LLVM 22 when --stack-first became default)

        # Replace else block with pass to avoid empty block syntax error

        sed -i "s/cmd.append('--no-stack-first')/pass/" tools/building.py



        # Verify --no-stack-first was removed (fail if patch is no longer needed)

        grep -q "cmd.append('--no-stack-first')" tools/building.py && \

          (echo "ERROR: --no-stack-first patch not needed anymore" && exit 1) || true



        # Fix /tmp symlink issue (macOS: /tmp -> /private/tmp) causing relpath miscalculation

        sed -i 's/os\.path\.relpath(source_dir, build_dir)/os.path.relpath(source_dir, os.path.realpath(build_dir))/' tools/system_libs.py

        sed -i 's/os\.path\.relpath(src, build_dir)/os.path.relpath(src, os.path.realpath(build_dir))/' tools/system_libs.py

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -2221,7 +2221,7 @@ with pkgs; 
  buildEmscriptenPackage = callPackage ../development/em-modules/generic { };



  emscripten = callPackage ../development/compilers/emscripten {

    llvmPackages = llvmPackages_21;

    llvmPackages = llvmPackages_22;

  };



  emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { });