From 2985284ccbff8f9774079ce2d7f02cf328776705 Mon Sep 17 00:00:00 2001 From: Rolf Schröder Date: Sat, 6 Mar 2021 06:30:58 +0100 Subject: android: Fix shebangs in auto-generated android toolchain scripts The script make_standalone_toolchain.py autogenerates some shell scripts when invoked. These scripts have a hardcoded shebang of '#!/bin/bash'. The generated scripts obviously do not work in a Nix environment. This commit makes sure the scripts have the correct shebang. --- pkgs/development/mobile/androidenv/ndk-bundle/default.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/development/mobile') diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index f74b949a7b3..5b7d5a3f1ba 100644 --- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -14,6 +14,10 @@ deployAndroidPackage { patchInstructions = lib.optionalString (os == "linux") ('' patchShebangs . + # Fix the shebangs of the auto-generated scripts. + substituteInPlace $(pwd)/build/tools/make_standalone_toolchain.py \ + --replace '#!/bin/bash' '#!${pkgs.bash}/bin/bash' + '' + lib.optionalString (builtins.compareVersions (lib.getVersion package) "21" > 0) '' patch -p1 \ --no-backup-if-mismatch < ${./make_standalone_toolchain.py_18.patch} || true -- cgit 1.4.1