summary refs log tree commit diff
path: root/pkgs/development/androidndk-pkgs
diff options
context:
space:
mode:
authorChristoph Bauer <mail@christoph-bauer.net>2022-06-26 20:02:31 +0200
committersternenseemann <sternenseemann@systemli.org>2022-06-28 12:25:19 +0200
commitb5c2b76cf4e1888b231bd011c4e699ec937b23ac (patch)
tree1b58ce494f03cb8662f5f4b947e7f77bfeb2a92a /pkgs/development/androidndk-pkgs
parent6dce91f57bbebaaa4638bde66cf2ca9a59251ea3 (diff)
downloadnixpkgs-b5c2b76cf4e1888b231bd011c4e699ec937b23ac.tar
nixpkgs-b5c2b76cf4e1888b231bd011c4e699ec937b23ac.tar.gz
nixpkgs-b5c2b76cf4e1888b231bd011c4e699ec937b23ac.tar.bz2
nixpkgs-b5c2b76cf4e1888b231bd011c4e699ec937b23ac.tar.lz
nixpkgs-b5c2b76cf4e1888b231bd011c4e699ec937b23ac.tar.xz
nixpkgs-b5c2b76cf4e1888b231bd011c4e699ec937b23ac.tar.zst
nixpkgs-b5c2b76cf4e1888b231bd011c4e699ec937b23ac.zip
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.
Diffstat (limited to 'pkgs/development/androidndk-pkgs')
-rw-r--r--pkgs/development/androidndk-pkgs/androidndk-pkgs.nix5
1 files changed, 4 insertions, 1 deletions
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