From 7cac79b3adc20cbf4e94bec35d7f8f9e6535de96 Mon Sep 17 00:00:00 2001
From: John Ericson <git@JohnEricson.me>
Date: Tue, 8 Sep 2020 09:32:06 -0400
Subject: [PATCH] androidndkPkgs: Take version from underlying package
We can now do this, so let's.
---
pkgs/development/androidndk-pkgs/androidndk-pkgs.nix | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
index 04420370ff1..995789b8c1b 100644
--- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
+++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
@@ -53,7 +53,9 @@ in
rec {
# Misc tools
- binaries = runCommand "ndk-gcc-binutils" {
+ binaries = runCommand "ndk-toolchain-binutils" {
+ pname = "ndk-toolchain-binutils";
+ inherit (androidndk) version;
isClang = true; # clang based cc, but bintools ld
nativeBuildInputs = [ makeWrapper ];
propagatedBuildInputs = [ androidndk ];