diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2017-07-30 20:32:04 +0200 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2017-07-30 20:40:04 +0200 |
commit | ace11d11b24dd64ef629da54f7ba76a5067745cb (patch) | |
tree | 7aa9a764201f9ae54915ac25ed839c114d1e47b0 | |
parent | a2b2c1e4bdd9695b32b081b60e9630f10f44069c (diff) | |
download | nixlib-ace11d11b24dd64ef629da54f7ba76a5067745cb.tar nixlib-ace11d11b24dd64ef629da54f7ba76a5067745cb.tar.gz nixlib-ace11d11b24dd64ef629da54f7ba76a5067745cb.tar.bz2 nixlib-ace11d11b24dd64ef629da54f7ba76a5067745cb.tar.lz nixlib-ace11d11b24dd64ef629da54f7ba76a5067745cb.tar.xz nixlib-ace11d11b24dd64ef629da54f7ba76a5067745cb.tar.zst nixlib-ace11d11b24dd64ef629da54f7ba76a5067745cb.zip |
android-studio: Fix the meta attributes
-rw-r--r-- | pkgs/applications/editors/android-studio/common.nix | 21 | ||||
-rw-r--r-- | pkgs/applications/editors/android-studio/packages.nix | 9 |
2 files changed, 18 insertions, 12 deletions
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index e74d04218f48..bd8e25fa41cc 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -34,7 +34,7 @@ let androidStudio = stdenv.mkDerivation { - inherit src meta; + inherit src; name = "${pname}"; buildInputs = [ makeWrapper @@ -103,12 +103,13 @@ let name = "${pname}-fhs-env"; }; -in writeTextFile { - name = "${pname}-${version}"; - destination = "/bin/${pname}"; - executable = true; - text = '' - #!${bash}/bin/bash - ${fhsEnv}/bin/${pname}-fhs-env ${androidStudio}/bin/studio.sh - ''; -} +in + writeTextFile { + name = "${pname}-${version}"; + destination = "/bin/${pname}"; + executable = true; + text = '' + #!${bash}/bin/bash + ${fhsEnv}/bin/${pname}-fhs-env ${androidStudio}/bin/studio.sh + ''; + } // { inherit meta; } diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix index 1dab1d472061..da3e8b8b944a 100644 --- a/pkgs/applications/editors/android-studio/packages.nix +++ b/pkgs/applications/editors/android-studio/packages.nix @@ -13,7 +13,11 @@ in rec { }; 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; license = licenses.asl20; platforms = [ "x86_64-linux" ]; @@ -36,8 +40,9 @@ in rec { }; 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; [ tomsmeets ]; + maintainers = with stdenv.lib.maintainers; [ primeos tomsmeets ]; }; } { fontsConf = makeFontsConf { |