diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-09-11 15:24:55 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-09-16 22:14:45 +0000 |
commit | 89c4dccbd5f33f71808d4b1baafe619696af1162 (patch) | |
tree | fb1b8d3a2f171164a05d404ab2340cfb1a9d3e21 /nixpkgs/pkgs/applications/editors/android-studio | |
parent | 8920a0e4d962a919238bab69ddc607d7f3396f70 (diff) | |
parent | e19054ab3cd5b7cc9a01d0efc71c8fe310541065 (diff) | |
download | nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.gz nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.bz2 nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.lz nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.xz nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.zst nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.zip |
Merge commit 'e19054ab3cd5b7cc9a01d0efc71c8fe310541065'
Diffstat (limited to 'nixpkgs/pkgs/applications/editors/android-studio')
-rw-r--r-- | nixpkgs/pkgs/applications/editors/android-studio/common.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/applications/editors/android-studio/default.nix | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/applications/editors/android-studio/common.nix b/nixpkgs/pkgs/applications/editors/android-studio/common.nix index 50a752b3eb96..0d406ad2d360 100644 --- a/nixpkgs/pkgs/applications/editors/android-studio/common.nix +++ b/nixpkgs/pkgs/applications/editors/android-studio/common.nix @@ -40,7 +40,7 @@ let drvName = "android-studio-${channel}-${version}"; androidStudio = stdenv.mkDerivation { - name = drvName; + name = "${drvName}-unwrapped"; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.tar.gz"; @@ -133,7 +133,7 @@ let multiPkgs = pkgs: [ pkgs.ncurses5 ]; }; in runCommand - "${drvName}-wrapper" + drvName { startScript = '' #!${bash}/bin/bash diff --git a/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/nixpkgs/pkgs/applications/editors/android-studio/default.nix index 9f7997860c61..b5381983240a 100644 --- a/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -14,11 +14,11 @@ let }; betaVersion = stableVersion; latestVersion = { # canary & dev - version = "3.6.0.9"; # "Android Studio 3.6 Canary 9" - build = "192.5830636"; - sha256Hash = "0c9zmxf2scsf9pygcbabzngl7cdyjgpir5pggjaj535ni0nsrr7p"; + version = "3.6.0.10"; # "Android Studio 3.6 Canary 10" + build = "192.5842447"; + sha256Hash = "0qyvqm0ihp6czx77skia87qnz87wrsp1a6la04dr4b0xln2c8m5b"; }; -in rec { +in { # Attributes are named by their corresponding release channels stable = mkStudio (stableVersion // { |