diff options
Diffstat (limited to 'nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index 475fe4564eee..a8b172f4eb5d 100644 --- a/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -11,15 +11,17 @@ let # than we do. We don't just use theirs because ours are less ambiguous and # some builds need that clarity. # - # FIXME: - # There's some dragons here. Build host and target concepts are being mixed up. - ndkInfoFun = { config, ... }: { + ndkBuildInfoFun = { config, ... }: { x86_64-apple-darwin = { double = "darwin-x86_64"; }; x86_64-unknown-linux-gnu = { double = "linux-x86_64"; }; + }.${config} or + (throw "Android NDK doesn't support building on ${config}, as far as we know"); + + ndkTargetInfoFun = { config, ... }: { i686-unknown-linux-android = { triple = "i686-linux-android"; arch = "x86"; @@ -37,11 +39,10 @@ let triple = "aarch64-linux-android"; }; }.${config} or - (throw "Android NDK doesn't support ${config}, as far as we know"); + (throw "Android NDK doesn't support targetting ${config}, as far as we know"); - buildInfo = ndkInfoFun stdenv.buildPlatform; - hostInfo = ndkInfoFun stdenv.hostPlatform; - targetInfo = ndkInfoFun stdenv.targetPlatform; + buildInfo = ndkBuildInfoFun stdenv.buildPlatform; + targetInfo = ndkTargetInfoFun stdenv.targetPlatform; inherit (stdenv.targetPlatform) sdkVer; suffixSalt = lib.replaceStrings ["-" "."] ["_" "_"] stdenv.targetPlatform.config; |