From f7a3a5ad941602e918c9ed2e94c37968c647b0d9 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 17 Jan 2019 18:41:37 +0100 Subject: [PATCH] androidStudioPackages.beta: Rename the binary according to the channel The old name "android-studio-preview" was a bit misleading while "android-studio-beta" should clearly reflect that this is from the beta channel. I hope that this does not break any workflows but since "android-studio-preview" was most likely not called from any scripts the risk should be low (also: most people probably use the stable version anyway). --- pkgs/applications/editors/android-studio/common.nix | 2 +- pkgs/applications/editors/android-studio/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 23e0584cb7f0..a1465766f8bf 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -158,9 +158,9 @@ in runCommand '' mkdir -p $out/{bin,share/pixmaps} - # TODO: Rename preview -> beta (and add -stable suffix?): echo -n "$startScript" > $out/bin/${pname} chmod +x $out/bin/${pname} + ln -s ${androidStudio}/bin/studio.png $out/share/pixmaps/${drvName}.png ln -s ${desktopItem}/share/applications $out/share/applications '' diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 745e36892fc4..c7dc08821624 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -35,7 +35,7 @@ in rec { beta = mkStudio (betaVersion // { channel = "beta"; - pname = "android-studio-preview"; + pname = "android-studio-beta"; }); dev = mkStudio (latestVersion // {