diff options
| author | Robin Gloster <mail@glob.in> | 2021-05-24 09:55:24 -0500 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2021-05-24 09:55:24 -0500 |
| commit | 4bc5fbef9d159e143fb7e2c3231932e6e76f667c (patch) | |
| tree | e2198f5c552e0667d838b8ec764ddb3a4d8f6dec /pkgs/applications/editors/android-studio | |
| parent | jq: fix build with structured-attrs on darwin (diff) | |
| parent | Merge pull request #123802 from superherointj/package-virtmanager-bugfix (diff) | |
| download | nixpkgs-origin/structured-attrs.tar.gz | |
Merge remote-tracking branch 'upstream/master' into structured-attrsorigin/structured-attrs
Diffstat (limited to 'pkgs/applications/editors/android-studio')
| -rw-r--r-- | pkgs/applications/editors/android-studio/common.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/editors/android-studio/default.nix | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 678d6a0a3532..6d9182b9d61a 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -145,7 +145,7 @@ let ]}" # AS launches LLDBFrontend with a custom LD_LIBRARY_PATH - wrapProgram $out/bin/lldb/bin/LLDBFrontend --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ + wrapProgram $(find $out -name LLDBFrontend) --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ ncurses5 zlib ]}" diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 466dfb2516e1..e68e95ba5421 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,18 +9,18 @@ let inherit buildFHSUserEnv; }; stableVersion = { - version = "4.1.3.0"; # "Android Studio 4.1.3" - build = "201.7199119"; - sha256Hash = "06xwgk7bwcmljka8xa56cfwwg858r0bl0xp2jb9hdnkwljf796gm"; + version = "4.2.1.0"; # "Android Studio 4.2.1" + build = "202.7351085"; + sha256Hash = "074y6i0h8zamjgvvs882im44clds3g6aq8rssl7sq1wx6hrn5q36"; }; betaVersion = { - version = "4.2.0.22"; # "Android Studio 4.2 Beta 6" - build = "202.7188722"; - sha256Hash = "0mzwkx1csx194wzg7dc1cii3c16wbmlbq1jdv9ly4nmdxlvc2rxb"; + version = "4.2.0.24"; # "Android Studio 4.2.0" + build = "202.7322048"; + sha256Hash = "1ii1zf8mv7xyql56wwkcdj5l4g3zaprdszv6r9md9r5zh78k4ccz"; }; latestVersion = { # canary & dev - version = "2020.3.1.10"; # "Android Studio Arctic Fox (2020.3.1) Canary 10" - sha256Hash = "15xxyjjjy5pnimc66dcwnqb7z4lq7ll4fl401a3br5ca4d1hpgsj"; + version = "2020.3.1.15"; # "Android Studio Arctic Fox (2020.3.1) Canary 15" + sha256Hash = "0k66ibflqwdlgapir5w2v1d4zjwn6464yk2hvlmif9lsfdvd0ivv"; }; in { # Attributes are named by their corresponding release channels |