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

android-studio: Fix the meta attributes

Browse Source
This commit is contained in:
Michael Weiss 2017-07-30 20:32:04 +02:00
parent a2b2c1e4bd
commit ace11d11b2
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/applications/editors/android-studio/common.nix
View File

@ -34,7 +34,7 @@
let let
androidStudio = stdenv.mkDerivation { androidStudio = stdenv.mkDerivation {
inherit src meta; inherit src;
name = "${pname}"; name = "${pname}";
buildInputs = [ buildInputs = [
makeWrapper makeWrapper
@ -103,12 +103,13 @@ let
name = "${pname}-fhs-env"; name = "${pname}-fhs-env";
}; };
in writeTextFile { in
name = "${pname}-${version}"; writeTextFile {
destination = "/bin/${pname}"; name = "${pname}-${version}";
executable = true; destination = "/bin/${pname}";
text = '' executable = true;
#!${bash}/bin/bash text = ''
${fhsEnv}/bin/${pname}-fhs-env ${androidStudio}/bin/studio.sh #!${bash}/bin/bash
''; ${fhsEnv}/bin/${pname}-fhs-env ${androidStudio}/bin/studio.sh
} '';
} // { inherit meta; }

9
pkgs/applications/editors/android-studio/packages.nix
View File

@ -13,7 +13,11 @@ in rec {
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The Official IDE for Android"; description = "The Official IDE for Android (stable version)";
longDescription = ''
Android Studio is the official IDE for Android app development, based on
IntelliJ IDEA.
'';
homepage = https://developer.android.com/studio/index.html; homepage = https://developer.android.com/studio/index.html;
license = licenses.asl20; license = licenses.asl20;
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
@ -36,8 +40,9 @@ in rec {
}; };
meta = stable.meta // { meta = stable.meta // {
description = "The Official IDE for Android (preview version)";
homepage = https://developer.android.com/studio/preview/index.html; homepage = https://developer.android.com/studio/preview/index.html;
maintainers = with stdenv.lib.maintainers; [ tomsmeets ]; maintainers = with stdenv.lib.maintainers; [ primeos tomsmeets ];
}; };
} { } {
fontsConf = makeFontsConf { fontsConf = makeFontsConf {