diff options
author | IvarWithoutBones <ivar.scholten@protonmail.com> | 2021-02-08 01:09:59 +0100 |
---|---|---|
committer | IvarWithoutBones <ivar.scholten@protonmail.com> | 2021-02-08 02:00:12 +0100 |
commit | 3c350e4b75fdf8d210d5369a2120d58763ffe7fd (patch) | |
tree | 9661b07dd5128aebf4c76534e23108914d9e3d9d /pkgs/applications/editors | |
parent | a6e5607595296dc28d8d10315f3b0dda9716debd (diff) | |
download | nixlib-3c350e4b75fdf8d210d5369a2120d58763ffe7fd.tar nixlib-3c350e4b75fdf8d210d5369a2120d58763ffe7fd.tar.gz nixlib-3c350e4b75fdf8d210d5369a2120d58763ffe7fd.tar.bz2 nixlib-3c350e4b75fdf8d210d5369a2120d58763ffe7fd.tar.lz nixlib-3c350e4b75fdf8d210d5369a2120d58763ffe7fd.tar.xz nixlib-3c350e4b75fdf8d210d5369a2120d58763ffe7fd.tar.zst nixlib-3c350e4b75fdf8d210d5369a2120d58763ffe7fd.zip |
androidStudioPackages.{stable,beta,canary,dev}: Fix LLDB debugger
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r-- | pkgs/applications/editors/android-studio/common.nix | 12 |
1 files changed, 11 insertions, 1 deletions
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" {} |