diff options
Diffstat (limited to 'lib/systems/default.nix')
| -rw-r--r-- | lib/systems/default.nix | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 074239b3fb6f1..cee09791bf542 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -179,7 +179,7 @@ let hasSharedLibraries = with final; (isAndroid || isGnu || isMusl # Linux (allows multiple libcs) || isDarwin || isSunOS || isOpenBSD || isFreeBSD || isNetBSD # BSDs - || isCygwin || isMinGW # Windows + || isCygwin || isMinGW || isWindows # Windows || isWasm # WASM ) && !isStatic; @@ -257,6 +257,22 @@ let if final.isMacOS then "MACOSX_DEPLOYMENT_TARGET" else if final.isiOS then "IPHONEOS_DEPLOYMENT_TARGET" else null; + + # Remove before 25.05 + androidSdkVersion = + if (args ? sdkVer && !args ? androidSdkVersion) then + throw "For android `sdkVer` has been renamed to `androidSdkVersion`" + else if (args ? androidSdkVersion) then + args.androidSdkVersion + else + null; + androidNdkVersion = + if (args ? ndkVer && !args ? androidNdkVersion) then + throw "For android `ndkVer` has been renamed to `androidNdkVersion`" + else if (args ? androidSdkVersion) then + args.androidNdkVersion + else + null; } // ( let selectEmulator = pkgs: @@ -323,6 +339,7 @@ let os = /**/ if rust ? platform then rust.platform.os or "none" 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; # https://doc.rust-lang.org/reference/conditional-compilation.html#target_family |