JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #27354 from TomSmeets/androidstudio-3.0

Browse Source 
android-studio-preview: init at 3.0.0.5 canary 6
This commit is contained in:
Jörg Thalheim 2017-07-19 00:39:10 +01:00 committed by GitHub
commit b2caceced3
3 changed files with 56 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/applications/editors/android-studio/default.nix → pkgs/applications/editors/android-studio/common.nix
View File

@ -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
'';
}

46
pkgs/applications/editors/android-studio/packages.nix Normal file
View File

@ -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 = [];
};
};
}

8
pkgs/top-level/all-packages.nix
View File

@ -13306,11 +13306,9 @@ with pkgs;
amsn = callPackage ../applications/networking/instant-messengers/amsn { };
android-studio = callPackage ../applications/editors/android-studio {
fontsConf = makeFontsConf {
fontDirectories = [];
};
};
androidStudioPackages = callPackage ../applications/editors/android-studio/packages.nix {};
android-studio = androidStudioPackages.stable;
android-studio-preview = androidStudioPackages.preview;
antfs-cli = callPackage ../applications/misc/antfs-cli {};