chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-12 02:40:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

rerun: fix wasm --no-modules build failure (#434890)

Browse Source
This commit is contained in:
Gaétan Lepage
2025-08-20 07:54:24 +02:00
committed by GitHub
parent da45bf9ae4 a0c17836f0
commit 8766d9c4eb
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/by-name/re/rerun/package.nix
View File

@@ -6,6 +6,7 @@
# nativeBuildInputs
binaryen,
lld,
llvmPackages,
pkg-config,
protobuf,
rustfmt,
@@ -31,7 +32,6 @@
"map_view"
],
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rerun";
version = "0.24.0";
@@ -99,6 +99,24 @@ rustPlatform.buildRustPackage (finalAttrs: {
nasm
];
# NOTE: Without setting these environment variables the web-viewer
# preBuild step uses the nix wrapped CC which doesn't support
# multiple targets including wasm32-unknown-unknown. These are taken
# from the following issue discussion in the rust ring crate:
# https://github.com/briansmith/ring/discussions/2581#discussioncomment-14096969
env =
let
inherit (llvmPackages) clang-unwrapped;
major-version = builtins.head (builtins.splitVersion clang-unwrapped.version);
# resource dir + builtins from the unwrapped clang
resourceDir = "${lib.getLib clang-unwrapped}/lib/clang/${major-version}";
includeDir = "${lib.getLib llvmPackages.libclang}/lib/clang/${major-version}/include";
in
{
CC_wasm32_unknown_unknown = lib.getExe clang-unwrapped;
CFLAGS_wasm32_unknown_unknown = "-isystem ${includeDir} -resource-dir ${resourceDir}";
};
buildInputs = [
freetype
glib