From 9d3c069cbda429268453099a0647cf4c26e9e0f8 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Mon, 12 May 2025 23:43:16 -0700 Subject: [PATCH] lib/systems: remove android cruft These used legacy names for Android SDK and NDK versions, so now we can do away with them. --- lib/systems/default.nix | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index eab2561678e3..cf3f335eb7d4 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -352,21 +352,9 @@ let 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; + # Handle Android SDK and NDK versions. + androidSdkVersion = args.androidSdkVersion or null; + androidNdkVersion = args.androidNdkVersion or null; } // ( let