diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2017-08-02 02:12:11 +0200 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2017-08-02 02:12:11 +0200 |
commit | 87b215d5f72cd51ea2b649e452c107c9e14f4abf (patch) | |
tree | 031ebf8bb7a2b59d986e8c0211458a22e188eb03 /pkgs | |
parent | 4472928a1d2b11c9cd56ed679e5a82fe1daa81ae (diff) |
android-studio-preview: 3.0.0.7 -> 3.0.0.8
This also contains some refactoring.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/editors/android-studio/common.nix | 9 | ||||
-rw-r--r-- | pkgs/applications/editors/android-studio/packages.nix | 30 |
2 files changed, 16 insertions, 23 deletions
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index bd8e25fa41ccf..360d373f0707b 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -1,4 +1,4 @@ -{ pname, version, build, src, meta }: +{ pname, version, build, sha256Hash, meta }: { bash , buildFHSUserEnv , coreutils @@ -34,8 +34,13 @@ let androidStudio = stdenv.mkDerivation { - inherit src; name = "${pname}"; + + src = fetchurl { + url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; + sha256 = sha256Hash; + }; + buildInputs = [ makeWrapper unzip diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix index da3e8b8b944a9..17f795ad68db9 100644 --- a/pkgs/applications/editors/android-studio/packages.nix +++ b/pkgs/applications/editors/android-studio/packages.nix @@ -1,16 +1,16 @@ { stdenv, callPackage, fetchurl, makeFontsConf }: let - mkStudio = opts: callPackage (import ./common.nix opts); + mkStudio = opts: callPackage (import ./common.nix opts) { + fontsConf = makeFontsConf { + fontDirectories = []; + }; + }; in rec { stable = mkStudio rec { pname = "android-studio"; version = "2.3.3.0"; build = "162.4069837"; - - src = fetchurl { - url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; - sha256 = "0zzis9m2xp44xwkj0zvcqw5rh3iyd3finyi5nqhgira1fkacz0qk"; - }; + sha256Hash = "0zzis9m2xp44xwkj0zvcqw5rh3iyd3finyi5nqhgira1fkacz0qk"; meta = with stdenv.lib; { description = "The Official IDE for Android (stable version)"; @@ -23,30 +23,18 @@ in rec { platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ primeos ]; }; - } { - fontsConf = makeFontsConf { - fontDirectories = []; - }; }; preview = mkStudio rec { pname = "android-studio-preview"; - version = "3.0.0.7"; # This is actually "Android Studio 3.0 Canary 8" - build = "171.4195411"; - - src = fetchurl { - url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; - sha256 = "1yzhr845shjq2cd5hcanppxmnj34ky9ry755y4ywf5f1w5ha5xzj"; - }; + version = "3.0.0.8"; # This is actually "Android Studio 3.0 Canary 9" + build = "171.4220116"; + sha256Hash = "02aw1m65wb5cgjq1dxm86c5m6p8b41kgjcgsl5d0h93fb4clf64b"; meta = stable.meta // { description = "The Official IDE for Android (preview version)"; homepage = https://developer.android.com/studio/preview/index.html; maintainers = with stdenv.lib.maintainers; [ primeos tomsmeets ]; }; - } { - fontsConf = makeFontsConf { - fontDirectories = []; - }; }; } |