gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib.systems: Fix setting rust.platform.os for wasm32-unknown-unknown

Browse Source 
Previously we would fallback to using `kernel` as the `os` which would
result in using the wrong `os` value (`none`) when actually we want
`unknown`. This seems to be a special case for wasm32-unknown-unknown
and wasm64-unknown-unknown so I extended the if statement to support it.
This commit is contained in:
Ilan Joselevich
2024-07-05 19:40:13 +03:00
parent 1eb5e94d66
commit bf61b8c8fb
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/systems/default.nix
View File

@@ -323,6 +323,7 @@ let
os = os =
/**/ if rust ? platform then rust.platform.os or "none" /**/ if rust ? platform then rust.platform.os or "none"
else if final.isDarwin then "macos" else if final.isDarwin then "macos"
else if final.isWasm && !final.isWasi then "unknown" # Needed for {wasm32,wasm64}-unknown-unknown.
else final.parsed.kernel.name; else final.parsed.kernel.name;
# https://doc.rust-lang.org/reference/conditional-compilation.html#target_family # https://doc.rust-lang.org/reference/conditional-compilation.html#target_family