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

idea.android-studio: 1.1.0b2 -> 1.1.0 

add androidsdk as dependency
                     set ANDROID_HOME for android-studio wrapper
This commit is contained in:
Edward Tjörnhammar 2015-02-23 19:47:28 +01:00
parent 6afc1907c8
commit a46065ce80
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/applications/editors/idea/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip, jdk { stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip, jdk
, coreutils, gnugrep, which, git, python, unzip , coreutils, gnugrep, which, git, python, unzip, androidsdk
}: }:
assert stdenv.isLinux; assert stdenv.isLinux;
@ -54,25 +54,26 @@ let
''; '';
installPhase = '' installPhase = ''
mkdir -vp $out/{bin,$name,share/pixmaps,libexec/${name}} mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}}
cp -va . $out/$name cp -a . $out/$name
ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${execName}.png ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${execName}.png
mv bin/fsnotifier* $out/libexec/${name}/. mv bin/fsnotifier* $out/libexec/${name}/.
jdk=${jdk.home} jdk=${jdk.home}
item=${desktopItem}
makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \ makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \
--prefix PATH : "$out/libexec/${name},${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \ --prefix PATH : "$out/libexec/${name},${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \
--prefix JDK_HOME : "$jdk" \ --prefix JDK_HOME : "$jdk" \
--prefix ${hiName}_JDK : "$jdk" --prefix ${hiName}_JDK : "$jdk"
cp -a "${desktopItem}"/* "$out" ln -s "$item/share/applications" $out/share
''; '';
}; };
buildAndroidStudio = { name, version, build, src, license, description }: buildAndroidStudio = { name, version, build, src, license, description }:
(mkIdeaProduct rec { let drv = (mkIdeaProduct rec {
inherit name version build src; inherit name version build src;
product = "Studio"; product = "Studio";
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -88,6 +89,13 @@ let
maintainers = with maintainers; [ edwtjo ]; maintainers = with maintainers; [ edwtjo ];
}; };
}); });
in stdenv.lib.overrideDerivation drv (x : {
buildInputs = x.buildInputs ++ [ makeWrapper ];
installPhase = x.installPhase + ''
wrapProgram "$out/bin/android-studio" \
--set ANDROID_HOME "${androidsdk}/libexec/android-sdk-linux/"
'';
});
buildClion = { name, version, build, src, license, description }: buildClion = { name, version, build, src, license, description }:
(mkIdeaProduct rec { (mkIdeaProduct rec {
@ -185,14 +193,14 @@ in
android-studio = buildAndroidStudio rec { android-studio = buildAndroidStudio rec {
name = "android-studio-${version}"; name = "android-studio-${version}";
version = "1.1.0b2"; version = "1.1.0";
build = "135.1711524"; build = "135.1740770";
description = "Android development environment based on IntelliJ IDEA"; description = "Android development environment based on IntelliJ IDEA";
license = stdenv.lib.licenses.asl20; license = stdenv.lib.licenses.asl20;
src = fetchurl { src = fetchurl {
url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" + url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" +
"/android-studio-ide-${build}-linux.zip"; "/android-studio-ide-${build}-linux.zip";
sha256 = "0pkmyk7ipd4bfbryhanak5mq3x8ix1yv4czx8yi9vdpa34b6pnkw"; sha256 = "1r2hrld3yfaxq3mw2xmzhvrrhc7w5xlv3d18rv758hy9n40c2nr1";
}; };
}; };

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

@ -8505,7 +8505,7 @@ let
cmdline = callPackage ../os-specific/darwin/command-line-tools {}; cmdline = callPackage ../os-specific/darwin/command-line-tools {};
apple-source-releases = import ../os-specific/darwin/apple-source-releases { inherit stdenv fetchurl pkgs; }; apple-source-releases = import ../os-specific/darwin/apple-source-releases { inherit stdenv fetchurl pkgs; };
in apple-source-releases // rec { in apple-source-releases // rec {
cctools_cross = callPackage (forceNativeDrv (callPackage ../os-specific/darwin/cctools/port.nix {}).cross) { cctools_cross = callPackage (forceNativeDrv (callPackage ../os-specific/darwin/cctools/port.nix {}).cross) {
cross = assert crossSystem != null; crossSystem; cross = assert crossSystem != null; crossSystem;
inherit maloader; inherit maloader;
xctoolchain = xcode.toolchain; xctoolchain = xcode.toolchain;
@ -10385,7 +10385,7 @@ let
libart = gnome2.libart_lgpl; libart = gnome2.libart_lgpl;
}; # latest version: gnome3.goffice }; # latest version: gnome3.goffice
idea = recurseIntoAttrs (callPackage ../applications/editors/idea { }); idea = recurseIntoAttrs (callPackage ../applications/editors/idea { androidsdk = androidsdk_4_4; });
libquvi = callPackage ../applications/video/quvi/library.nix { }; libquvi = callPackage ../applications/video/quvi/library.nix { };