2 files changed, 20 insertions, 4 deletions
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index cd031ce5ac8c..c980999dc6ba 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -1,4 +1,4 @@
-{ channel, pname, version, build, sha256Hash }:
+{ channel, pname, version, build, sha256Hash, deprecated ? false }:
 
 { bash
 , buildFHSUserEnv
@@ -37,6 +37,18 @@
 }:
 
 let
+  # TODO: This is a bit stupid to be honest...
+  # The problem is that we have to make sure this is only executed if the
+  # derivation is actually build to avoid always printing this warning (e.g.
+  # "nix-env -qaP"). Since this will always evaluate to "" it won't actually
+  # change the derivation (only generate a side-effect) but we have to make
+  # sure this expression is evaluated lazily!
+  printDeprecationWarning = if deprecated then (builtins.trace ''
+    android-studio-preview and androidStudioPackages.preview are old aliases
+    and will be dropped at some point, please use androidStudioPackages.beta
+    instead (corresponds to the correct channel name).''
+    "")
+    else "";
   drvName = "android-studio-${channel}-${version}";
   androidStudio = stdenv.mkDerivation {
     name = drvName;
@@ -130,7 +142,7 @@ in
     text = ''
       #!${bash}/bin/bash
       ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh
-    '';
+    '' + printDeprecationWarning;
   } // {
     meta = with stdenv.lib; {
       description = "The Official IDE for Android (${channel} channel)";
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index b60687c50bac..af58611bddf4 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -23,8 +23,12 @@ let
     sha256Hash = "0r93yzw87cgzz60p60gknij5vaqmv1a1kyd4cr9gx8cbxw46lhwh";
   };
 in rec {
-  # Old alias
-  preview = beta;
+  # TODO: Drop old alias after 18.09
+  preview = mkStudio (betaVersion // {
+    channel = "beta";
+    pname = "android-studio-preview";
+    deprecated = true;
+  });
 
   # Attributes are named by their corresponding release channels