From b5c2b76cf4e1888b231bd011c4e699ec937b23ac Mon Sep 17 00:00:00 2001 From: Christoph Bauer Date: Sun, 26 Jun 2022 20:02:31 +0200 Subject: androidndkPkgs.binaries: correct passthru parameters Without this patch ghc 8.10.7 with taget platform aarch64-android fails to build due an invalid nix expression (missing attribute targetPrefix). To fix that we make the binaries attribute to conform with the expectation about unwrapped bintools / cc derivations w.r.t. passthru attributes. --- pkgs/development/androidndk-pkgs/androidndk-pkgs.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pkgs/development/androidndk-pkgs') diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index 04dfbcbedf0..736e088454e 100644 --- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -56,9 +56,12 @@ rec { binaries = runCommand "ndk-toolchain-binutils" { pname = "ndk-toolchain-binutils"; inherit (androidndk) version; - isClang = true; # clang based cc, but bintools ld nativeBuildInputs = [ makeWrapper ]; propagatedBuildInputs = [ androidndk ]; + passthru = { + targetPrefix = prefix; + isClang = true; # clang based cc, but bintools ld + }; } '' mkdir -p $out/bin -- cgit 1.4.1