diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2019-10-18 16:32:00 +0000 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2019-10-18 16:32:00 +0000 |
| commit | 0f74f62ee25ac2d21bd67c29b8efc3ad079a72a8 (patch) | |
| tree | bd701e982d896952f4291e4b795c85bb581593b8 /nixpkgs/pkgs/applications/editors/android-studio | |
| parent | dae1ae41b3a575e87d411e0cd9daa42a85c5aa89 (diff) | |
| parent | 1c40ee6fc44f7eb474c69ea070a43247a1a2c83c (diff) | |
Merge commit '1c40ee6fc44f7eb474c69ea070a43247a1a2c83c'
Diffstat (limited to 'nixpkgs/pkgs/applications/editors/android-studio')
| -rw-r--r-- | nixpkgs/pkgs/applications/editors/android-studio/common.nix | 24 | ||||
| -rw-r--r-- | nixpkgs/pkgs/applications/editors/android-studio/default.nix | 14 |
2 files changed, 30 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/applications/editors/android-studio/common.nix b/nixpkgs/pkgs/applications/editors/android-studio/common.nix index 0d406ad2d36..93c9b4c04fb 100644 --- a/nixpkgs/pkgs/applications/editors/android-studio/common.nix +++ b/nixpkgs/pkgs/applications/editors/android-studio/common.nix @@ -1,8 +1,11 @@ { channel, pname, version, build, sha256Hash }: -{ bash +{ alsaLib +, bash , buildFHSUserEnv , coreutils +, dbus +, expat , fetchurl , findutils , file @@ -19,16 +22,24 @@ , libpulseaudio , libGL , libX11 +, libxcb +, libXcomposite +, libXcursor +, libXdamage , libXext +, libXfixes , libXi , libXrandr , libXrender , libXtst , makeWrapper +, nspr +, nss , pciutils , pkgsi686Linux , setxkbmap , stdenv +, systemd , unzip , which , runCommand @@ -99,9 +110,20 @@ let libXrandr # For Android emulator + alsaLib + dbus + expat libpulseaudio libX11 + libxcb + libXcomposite + libXcursor + libXdamage + libXfixes libGL + nspr + nss + systemd # For GTKLookAndFeel gtk2 diff --git a/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/nixpkgs/pkgs/applications/editors/android-studio/default.nix index b059747e052..b47f444709b 100644 --- a/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -8,15 +8,15 @@ let inherit (gnome2) GConf gnome_vfs; }; stableVersion = { - version = "3.5.0.21"; # "Android Studio 3.5" - build = "191.5791312"; - sha256Hash = "0vvk2vhklxg9wfi4lv4sahs5ahhb1mki1msy3yixmr56vipgv52p"; + version = "3.5.1.0"; # "Android Studio 3.5.1" + build = "191.5900203"; + sha256Hash = "0afxlif8pkrl6m1lhiqri1qv4vf5mfm1yg6qk5rad0442hm3kz4l"; }; - betaVersion = stableVersion; + betaVersion = latestVersion; latestVersion = { # canary & dev - version = "3.6.0.12"; # "Android Studio 3.6 Canary 12" - build = "192.5871855"; - sha256Hash = "0pxvpxqdxv37sl72p7gml70k6kl717k6avw9p0l00cys0zbvb3zq"; + version = "3.6.0.13"; # "Android Studio 3.6 Beta 1" + build = "192.5916306"; + sha256Hash = "0kvz3mgpfb3wqr1pw9847d5syswlzls3b4nilzgk6w127k2zmkfy"; }; in { # Attributes are named by their corresponding release channels |