diff --git a/pkgs/applications/editors/android-studio-for-platform/common.nix b/pkgs/applications/editors/android-studio-for-platform/common.nix index 299bc5c627c0..791f4c948e7f 100644 --- a/pkgs/applications/editors/android-studio-for-platform/common.nix +++ b/pkgs/applications/editors/android-studio-for-platform/common.nix @@ -2,6 +2,7 @@ channel, pname, version, + versionPrefix, sha256Hash, }: @@ -51,7 +52,7 @@ let drvName = "${pname}-${version}"; - filename = "asfp-${version}-linux.deb"; + filename = "asfp-${versionPrefix}-${version}-linux.deb"; androidStudioForPlatform = stdenv.mkDerivation { name = "${drvName}-unwrapped"; @@ -67,7 +68,7 @@ let ]; installPhase = '' - cp -r "./opt/${pname}/" $out + cp -r ./tmp/*/ $out wrapProgram $out/bin/studio.sh \ --set-default JAVA_HOME "$out/jbr" \ --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ diff --git a/pkgs/applications/editors/android-studio-for-platform/default.nix b/pkgs/applications/editors/android-studio-for-platform/default.nix index 444368bb9f9e..aafc1a9b0201 100644 --- a/pkgs/applications/editors/android-studio-for-platform/default.nix +++ b/pkgs/applications/editors/android-studio-for-platform/default.nix @@ -16,12 +16,15 @@ let inherit tiling_wm; }; stableVersion = { - version = "2023.2.1.20"; # Android Studio Iguana | 2023.2.1 Beta 2 - sha256Hash = "sha256-cM/pkSghqLUUvJVF/OVLDOxVBJlJLH8ge1bfZtDUegY="; + version = "2024.2.2.13"; + # this seems to be a fuckup on google's side + versionPrefix = "Ladybug%20Feature%20Drop"; + sha256Hash = "sha256-yMUTWOpYHa/Aizrgvs/mbofrDqrbL5bJYjuklIdyU/0="; }; canaryVersion = { - version = "2023.3.2.1"; # Android Studio Jellyfish | 2023.3.2 Canary 1 - sha256Hash = "sha256-XOsbMyNentklfEp1k49H3uFeiRNMCV/Seisw9K1ganM="; + version = "2024.3.1.9"; + versionPrefix = "canary-meerkat"; + sha256Hash = "sha256-j5KEwHbc+0eFi3GZlD5PMuM/RWw2MJ1PaXZrPMvhCik="; }; in {