android-studio-for-platform: set pname and version instead name

1 files changed, 6 insertions, 5 deletions

diff --git a/pkgs/applications/editors/android-studio-for-platform/common.nix b/pkgs/applications/editors/android-studio-for-platform/common.nix
index 7c2a3b2ab3ee..4e2fce6eb9c2 100644
--- a/pkgs/applications/editors/android-studio-for-platform/common.nix
+++ b/pkgs/applications/editors/android-studio-for-platform/common.nix
@@ -51,11 +51,11 @@
 }:
 
 let
-  drvName = "${pname}-${version}";
   filename = "asfp-${versionPrefix}-${version}-linux.deb";
 
   androidStudioForPlatform = stdenv.mkDerivation {
-    name = "${drvName}-unwrapped";
+    pname = "${pname}-unwrapped";
+    inherit version;
 
     src = fetchurl {
       url = "https://dl.google.com/android/asfp/${filename}";
@@ -145,7 +145,7 @@ let
   # (e.g. `mksdcard`) have `/lib/ld-linux.so.2` set as the interpreter. An FHS
   # environment is used as a work around for that.
   fhsEnv = buildFHSEnv {
-    pname = "${drvName}-fhs-env";
+    pname = "${pname}-fhs-env";
     inherit version;
     multiPkgs = pkgs: [
       zlib
@@ -158,11 +158,12 @@ let
     '';
   };
 in
-runCommand drvName
+runCommand "${pname}-${version}"
   {
+    inherit pname version;
     startScript = ''
       #!${bash}/bin/bash
-      ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudioForPlatform}/bin/studio.sh "$@"
+      ${lib.getExe fhsEnv} ${androidStudioForPlatform}/bin/studio.sh "$@"
     '';
     preferLocalBuild = true;
     allowSubstitutes = false;