androidStudioPackages.{stable,beta,canary,dev}: Fix LLDB debugger

This commit is contained in:
IvarWithoutBones 2021-02-08 01:09:59 +01:00
parent a6e5607595
commit 3c350e4b75

View File

@ -35,6 +35,7 @@
, libXrender
, libXtst
, makeWrapper
, ncurses5
, nspr
, nss
, pciutils
@ -141,9 +142,18 @@ let
]}" \
--set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \
--set FONTCONFIG_FILE ${fontsConf}
# AS launches LLDBFrontend with a custom LD_LIBRARY_PATH
wrapProgram $out/bin/lldb/bin/LLDBFrontend --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [
ncurses5
zlib
]}"
'';
};
# Causes the shebangs in interpreter scripts deployed to mobile devices to be patched, which Android does not understand
dontPatchShebangs = true;
desktopItem = makeDesktopItem {
name = drvName;
exec = pname;
@ -161,7 +171,7 @@ let
fhsEnv = buildFHSUserEnv {
name = "${drvName}-fhs-env";
multiPkgs = pkgs: [
pkgs.ncurses5
ncurses5
# Flutter can only search for certs Fedora-way.
(runCommand "fedoracert" {}