From 3c350e4b75fdf8d210d5369a2120d58763ffe7fd Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Mon, 8 Feb 2021 01:09:59 +0100 Subject: [PATCH] androidStudioPackages.{stable,beta,canary,dev}: Fix LLDB debugger --- pkgs/applications/editors/android-studio/common.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 0ce0a37d876f..b760e83f8eea 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -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" {}