Unverified Commit feb0a690 authored by @mjones's avatar @mjones Committed by GitHub
Browse files

android-studio-for-platform: set pname and version instead name (#486669)

parents b7d8186a dc4edd03
Loading
Loading
Loading
Loading
+6 −5
Original line number Diff line number Diff line
@@ -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;