mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 11:45:45 +03:00
lib/systems: remove android cruft
These used legacy names for Android SDK and NDK versions, so now we can do away with them.
This commit is contained in:
parent
688122cd5d
commit
9d3c069cbd
1 changed files with 3 additions and 15 deletions
|
@ -352,21 +352,9 @@ let
|
||||||
else
|
else
|
||||||
null;
|
null;
|
||||||
|
|
||||||
# Remove before 25.05
|
# Handle Android SDK and NDK versions.
|
||||||
androidSdkVersion =
|
androidSdkVersion = args.androidSdkVersion or null;
|
||||||
if (args ? sdkVer && !args ? androidSdkVersion) then
|
androidNdkVersion = args.androidNdkVersion or null;
|
||||||
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
|
let
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue