diff options
author | Tom Smeets <Tom.TSmeets@Gmail.com> | 2017-07-13 11:23:24 +0200 |
---|---|---|
committer | Tom Smeets <Tom.TSmeets@Gmail.com> | 2017-07-13 11:38:05 +0200 |
commit | 9ab69a3416820df4b499e9a9fe0eb347985fd0c8 (patch) | |
tree | c1e6f717872e1f965d9e18de850287d6f1cc1b2c /pkgs/applications | |
parent | 9d28cd9ca4169c5850e4b193e4a5eb9b7b451e93 (diff) | |
download | nixlib-9ab69a3416820df4b499e9a9fe0eb347985fd0c8.tar nixlib-9ab69a3416820df4b499e9a9fe0eb347985fd0c8.tar.gz nixlib-9ab69a3416820df4b499e9a9fe0eb347985fd0c8.tar.bz2 nixlib-9ab69a3416820df4b499e9a9fe0eb347985fd0c8.tar.lz nixlib-9ab69a3416820df4b499e9a9fe0eb347985fd0c8.tar.xz nixlib-9ab69a3416820df4b499e9a9fe0eb347985fd0c8.tar.zst nixlib-9ab69a3416820df4b499e9a9fe0eb347985fd0c8.zip |
android-studio-preview: init at 3.0.0.5 canary 6
Added the `androidStudioPackages` attribute containing both the `stable` and `preview` channels. Changed the attribute `andorid-studio` to point to `androidStudioPackages.stable` Added the attribute `andorid-studio-preview` pointing to `androidStudioPackages.preview` I have tested this package using the new koltin support, no issues found yet.
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/editors/android-studio/common.nix (renamed from pkgs/applications/editors/android-studio/default.nix) | 27 | ||||
-rw-r--r-- | pkgs/applications/editors/android-studio/packages.nix | 46 |
2 files changed, 53 insertions, 20 deletions
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/common.nix index 0ba89099eb3d..e74d04218f48 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -1,3 +1,4 @@ +{ pname, version, build, src, meta }: { bash , buildFHSUserEnv , coreutils @@ -32,12 +33,9 @@ }: let - - version = "2.3.3.0"; - build = "162.4069837"; - androidStudio = stdenv.mkDerivation { - name = "android-studio"; + inherit src meta; + name = "${pname}"; buildInputs = [ makeWrapper unzip @@ -96,32 +94,21 @@ let --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ --set FONTCONFIG_FILE ${fontsConf} ''; - src = fetchurl { - url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; - sha256 = "0zzis9m2xp44xwkj0zvcqw5rh3iyd3finyi5nqhgira1fkacz0qk"; - }; - meta = with stdenv.lib; { - description = "The Official IDE for Android"; - homepage = https://developer.android.com/studio/index.html; - license = licenses.asl20; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ primeos ]; - }; }; # Android Studio downloads prebuilt binaries as part of the SDK. These tools # (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 = buildFHSUserEnv { - name = "android-studio-fhs-env"; + name = "${pname}-fhs-env"; }; in writeTextFile { - name = "android-studio-${version}"; - destination = "/bin/android-studio"; + name = "${pname}-${version}"; + destination = "/bin/${pname}"; executable = true; text = '' #!${bash}/bin/bash - ${fhsEnv}/bin/android-studio-fhs-env ${androidStudio}/bin/studio.sh + ${fhsEnv}/bin/${pname}-fhs-env ${androidStudio}/bin/studio.sh ''; } diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix new file mode 100644 index 000000000000..cf7173934bb4 --- /dev/null +++ b/pkgs/applications/editors/android-studio/packages.nix @@ -0,0 +1,46 @@ +{ stdenv, callPackage, fetchurl, makeFontsConf }: +let + mkStudio = opts: callPackage (import ./common.nix opts); +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"; + }; + + meta = with stdenv.lib; { + description = "The Official IDE for Android"; + homepage = https://developer.android.com/studio/index.html; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ primeos ]; + }; + } { + fontsConf = makeFontsConf { + fontDirectories = []; + }; + }; + + preview = mkStudio rec { + pname = "android-studio-preview"; + version = "3.0.0.5"; + build = "171.4163606"; + + src = fetchurl { + url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; + sha256 = "1gxnpw4jf3iic9d47sjbndpysq8kk8pgnb8l7azkc2rba5cj8skg"; + }; + + meta = stable.meta // { + homepage = https://developer.android.com/studio/preview/index.html; + }; + } { + fontsConf = makeFontsConf { + fontDirectories = []; + }; + }; +} |