lol
fork

Configure Feed

Select the types of activity you want to include in your feed.

androidndkPkgs: separate build and target ndkInfoFun

remove unused hostInfo variable, the uses of it were removed in (androidndk: remove legacy ndks)[2408ef3c6faa0ba0d513257378563ddc886f1020].

This prevents exiting with `error "attribute 'triple' missing"`
It's better to exit with a throw than a attribute missing which cannot

Artturin b2bcfe74 2557230b

+8 -7
+8 -7
pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
··· 11 11 # than we do. We don't just use theirs because ours are less ambiguous and 12 12 # some builds need that clarity. 13 13 # 14 - # FIXME: 15 - # There's some dragons here. Build host and target concepts are being mixed up. 16 - ndkInfoFun = { config, ... }: { 14 + ndkBuildInfoFun = { config, ... }: { 17 15 x86_64-apple-darwin = { 18 16 double = "darwin-x86_64"; 19 17 }; 20 18 x86_64-unknown-linux-gnu = { 21 19 double = "linux-x86_64"; 22 20 }; 21 + }.${config} or 22 + (throw "Android NDK doesn't support building on ${config}, as far as we know"); 23 + 24 + ndkTargetInfoFun = { config, ... }: { 23 25 i686-unknown-linux-android = { 24 26 triple = "i686-linux-android"; 25 27 arch = "x86"; ··· 37 39 triple = "aarch64-linux-android"; 38 40 }; 39 41 }.${config} or 40 - (throw "Android NDK doesn't support ${config}, as far as we know"); 42 + (throw "Android NDK doesn't support targetting ${config}, as far as we know"); 41 43 42 - buildInfo = ndkInfoFun stdenv.buildPlatform; 43 - hostInfo = ndkInfoFun stdenv.hostPlatform; 44 - targetInfo = ndkInfoFun stdenv.targetPlatform; 44 + buildInfo = ndkBuildInfoFun stdenv.buildPlatform; 45 + targetInfo = ndkTargetInfoFun stdenv.targetPlatform; 45 46 46 47 inherit (stdenv.targetPlatform) sdkVer; 47 48 suffixSalt = lib.replaceStrings ["-" "."] ["_" "_"] stdenv.targetPlatform.config;