From d8c12247c703b6ca7e0e48293e2aee74910c10c5 Mon Sep 17 00:00:00 2001 From: whispers Date: Fri, 12 Dec 2025 21:35:23 -0500 Subject: [PATCH] wamrc: 2.3.1 -> 2.4.4 This build was failing due to needing access to files outside the `wamr-compiler` directory, so we `cd` into the build directory instead of using `sourceRoot`. Additionally, this fails to link with LLVM 21, so we override the LLVM version to override it to LLVM 20. Example failing Hydra build: https://hydra.nixos.org/build/314568884 --- pkgs/by-name/wa/wamrc/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/wa/wamrc/package.nix b/pkgs/by-name/wa/wamrc/package.nix index f2143da08c18..e945de824167 100644 --- a/pkgs/by-name/wa/wamrc/package.nix +++ b/pkgs/by-name/wa/wamrc/package.nix @@ -3,19 +3,19 @@ stdenv, fetchFromGitHub, cmake, - llvmPackages, + llvm_20, nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "wamrc"; - version = "2.3.1"; + version = "2.4.4"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wasm-micro-runtime"; tag = "WAMR-${finalAttrs.version}"; - hash = "sha256-Rhn26TRyjkR30+zyosfooOGjhvG+ztYtJVQlRfzWEFo="; + hash = "sha256-pNudBKnhdR/Ye0m2tVZB/wSfJZYK8+gdCpCp0rDp0o4="; }; nativeBuildInputs = [ @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - llvmPackages.llvm + llvm_20 ]; cmakeFlags = @@ -32,10 +32,10 @@ stdenv.mkDerivation (finalAttrs: { ] ++ [ "-DWAMR_BUILD_WITH_CUSTOM_LLVM=ON" - "-DLLVM_DIR=${llvmPackages.llvm.dev}/lib/cmake/llvm" + "-DLLVM_DIR=${llvm_20.dev}/lib/cmake/llvm" ]; - sourceRoot = "${finalAttrs.src.name}/wamr-compiler"; + preConfigure = "cd wamr-compiler"; passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=WAMR-(.*)" ]; };