Skip to content

Commit 6eda008

Browse files
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
1 parent 4f3ce68 commit 6eda008

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

pkgs/by-name/wa/wamrc/package.nix

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33
stdenv,
44
fetchFromGitHub,
55
cmake,
6-
llvmPackages,
6+
llvm_20,
77
nix-update-script,
88
}:
99

1010
stdenv.mkDerivation (finalAttrs: {
1111
pname = "wamrc";
12-
version = "2.3.1";
12+
version = "2.4.4";
1313

1414
src = fetchFromGitHub {
1515
owner = "bytecodealliance";
1616
repo = "wasm-micro-runtime";
1717
tag = "WAMR-${finalAttrs.version}";
18-
hash = "sha256-Rhn26TRyjkR30+zyosfooOGjhvG+ztYtJVQlRfzWEFo=";
18+
hash = "sha256-pNudBKnhdR/Ye0m2tVZB/wSfJZYK8+gdCpCp0rDp0o4=";
1919
};
2020

2121
nativeBuildInputs = [
2222
cmake
2323
];
2424

2525
buildInputs = [
26-
llvmPackages.llvm
26+
llvm_20
2727
];
2828

2929
cmakeFlags =
@@ -32,10 +32,10 @@ stdenv.mkDerivation (finalAttrs: {
3232
]
3333
++ [
3434
"-DWAMR_BUILD_WITH_CUSTOM_LLVM=ON"
35-
"-DLLVM_DIR=${llvmPackages.llvm.dev}/lib/cmake/llvm"
35+
"-DLLVM_DIR=${llvm_20.dev}/lib/cmake/llvm"
3636
];
3737

38-
sourceRoot = "${finalAttrs.src.name}/wamr-compiler";
38+
preConfigure = "cd wamr-compiler";
3939

4040
passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=WAMR-(.*)" ]; };
4141

0 commit comments

Comments
 (0)