Unverified Commit eb786288 authored by Masum Reza's avatar Masum Reza Committed by GitHub
Browse files

treewide: adopt android packages as NixOS/android 



Co-authored-by: default avatarMorgan Jones <me@numin.it>
Signed-off-by: default avatarJohn Titor <50095635+JohnRTitor@users.noreply.github.com>
parent e049c438

pkgs/applications/editors/android-studio-for-platform/common.nix

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ runCommand drvName 
      # binaries are also distributed as proprietary software (unlike the

      # source-code itself).

      platforms = [ "x86_64-linux" ];

      maintainers = with maintainers; [ robbins ];

      maintainers = teams.android.members ++ (with maintainers; [ robbins ]);

      mainProgram = pname;

    };

  }

pkgs/applications/editors/android-studio/common.nix

+5 −6
Original line number Diff line number Diff line
@@ -323,13 +323,12 @@ let 
          # source-code itself).

          platforms = [ "x86_64-linux" ];

          maintainers =

            with lib.maintainers;

            rec {

              stable = [

              stable =

                lib.teams.android.members

                ++ (with lib.maintainers; [

                  alapshin

                johnrtitor

                numinit

              ];

                ]);

              beta = stable;

              canary = stable;

              dev = stable;

pkgs/by-name/an/android-studio-tools/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ stdenvNoCC.mkDerivation { 
    downloadPage = "https://developer.android.com/studio";

    changelog = "https://developer.android.com/studio/releases";

    license = lib.licenses.unfree;

    maintainers = with lib.maintainers; [ pandapip1 ];

    maintainers = lib.teams.android.members ++ (with lib.maintainers; [ pandapip1 ]);

    platforms = lib.platforms.all;

    sourceProvenance = with lib.sourceTypes; [ fromSource ]; # The 'binaries' are actually shell scripts

  };

pkgs/by-name/an/android-udev-rules/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec { 
    description = "Android udev rules list aimed to be the most comprehensive on the net";

    platforms = platforms.linux;

    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ abbradar ];

    maintainers = lib.teams.android.members ++ (with maintainers; [ abbradar ]);

  };

}

pkgs/development/androidndk-pkgs/androidndk-pkgs.nix

+6 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ let 
  );

in



rec {

lib.recurseIntoAttrs rec {

  # Misc tools

  binaries = stdenv.mkDerivation {

    pname = "${targetPrefix}ndk-toolchain";
@@ -138,6 +138,11 @@ rec { 


      patchShebangs $out/bin

    '';

    meta = {

      description = "The Android NDK toolchain, tuned for other platforms";

      license = with lib.licenses; [ unfree ];

      maintainers = lib.teams.android.members;

    };

  };



  binutils = wrapBintoolsWith {