commit d17bcfc5f088d487da65d4ec9a2dc1990c912319 · pyrox.dev/nixpkgs

+15 -2

pkgs/development/mobile/androidenv/addons.nix

···

       268
       268
        
             };

     

       269
       269
        
           };

     

       270
       270
        
       

     

       271
       271
       +
         google_apis_25 = buildGoogleApis {

     

       272
       272
       +
           name = "google_apis-25";

     

       273
       273
       +
             src = fetchurl {

     

       274
       274
       +
               url = https://dl.google.com/android/repository/google_apis-25_r1.zip;

     

       275
       275
       +
               sha1 = "550e83eea9513ab11c44919ac6da54b36084a9f3";

     

       276
       276
       +
             };

     

       277
       277
       +
             meta = {

     

       278
       278
       +
               description = "Android + Google APIs";

     

       279
       279
       +
       

     

       280
       280
       +
             };

     

       281
       281
       +
           };

     

       282
       282
       +
       

     

       271
       283
        
         android_support_extra = buildGoogleApis {

     

       272
       284
        
           name = "android_support_extra";

     

       273
       285
        
           src = fetchurl {

     
···

       280
       292
        
           };

     

       281
       293
        
         };

     

       282
       294
        
       

     

       295
       295
       +
       

     

       283
       296
        
         google_play_services = buildGoogleApis {

     

       284
       297
        
           name = "google_play_services";

     

       285
       298
        
           src = fetchurl {

     

       286
       286
       -
             url = https://dl.google.com/android/repository/google_play_services_v8_rc41.zip;

     

       287
       287
       -
             sha1 = "7a50dec81ba9c9b51d7778c19ca05002498209e8";

     

       299
       299
       +
             url = https://dl.google.com/android/repository/google_play_services_v11_rc16.zip;

     

       300
       300
       +
             sha1 = "55be81c50041f6a8f62947418f74f683369c971f";

     

       288
       301
        
           };

     

       289
       302
        
           meta = {

     

       290
       303
        
             description = "Google Play services client library and sample code";

+14

pkgs/development/mobile/androidenv/default.nix

···

       181
       181
        
           useGooglePlayServices = true;

     

       182
       182
        
         };

     

       183
       183
        
       

     

       184
       184
       +
         androidsdk_7_1_1 = androidsdk {

     

       185
       185
       +
           platformVersions = [ "25" ];

     

       186
       186
       +
           abiVersions = [ "x86" "x86_64"];

     

       187
       187
       +
           useGoogleAPIs = true;

     

       188
       188
       +
         };

     

       189
       189
       +
       

     

       190
       190
       +
         androidsdk_7_1_1_extras = androidsdk {

     

       191
       191
       +
           platformVersions = [ "25" ];

     

       192
       192
       +
           abiVersions = [ "x86" "x86_64"];

     

       193
       193
       +
           useGoogleAPIs = true;

     

       194
       194
       +
           useExtraSupportLibs = true;

     

       195
       195
       +
           useGooglePlayServices = true;

     

       196
       196
       +
         };

     

       197
       197
       +
       

     

       184
       198
        
         androidndk = import ./androidndk.nix {

     

       185
       199
        
           inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper;

     

       186
       200
        
           inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which;

+2 -1

pkgs/development/mobile/androidenv/fetch.sh

···

       1
       1
       -
       #!/bin/sh

     

       1
       1
       +
       #! /usr/bin/env nix-shell

     

       2
       2
       +
       #! nix-shell -i bash --pure -p androidsdk curl libxslt

     

       2
       3
        
       

     

       3
       4
        
       # this shows a list of available xmls

     

       4
       5
        
       android list sdk | grep 'Parse XML:' | cut -f8- -d\  # | xargs -n 1 curl -O

+9 -9

pkgs/top-level/all-packages.nix

···

       525
       525
        
           client = true;

     

       526
       526
        
         });

     

       527
       527
        
       

     

       528
       528
       -
         androidenv = callPackage ../development/mobile/androidenv {

     

       529
       529
       -
           pkgs_i686 = pkgsi686Linux;

     

       530
       530
       -
         };

     

       531
       531
       -
       

     

       532
       532
       -
         adb-sync = callPackage ../development/mobile/adb-sync { };

     

       533
       533
       -
       

     

       534
       528
        
         apg = callPackage ../tools/security/apg { };

     

       535
       529
        
       

     

       536
       530
        
         autorevision = callPackage ../tools/misc/autorevision { };

     
···

       589
       583
        
           pkgs_i686 = pkgsi686Linux;

     

       590
       584
        
         };

     

       591
       585
        
       

     

       592
       592
       -
         inherit (androidenv) androidsdk_4_4 androidndk;

     

       586
       586
       +
         adb-sync = callPackage ../development/mobile/adb-sync { };

     

       593
       587
        
       

     

       594
       594
       -
         androidsdk = androidenv.androidsdk_7_0;

     

       588
       588
       +
         androidenv = callPackage ../development/mobile/androidenv {

     

       589
       589
       +
           pkgs_i686 = pkgsi686Linux;

     

       590
       590
       +
         };

     

       595
       591
        
       

     

       596
       596
       -
         androidsdk_extras = self.androidenv.androidsdk_7_0_extras;

     

       592
       592
       +
         inherit (androidenv) androidndk;

     

       593
       593
       +
       

     

       594
       594
       +
         androidsdk = androidenv.androidsdk_7_1_1;

     

       595
       595
       +
       

     

       596
       596
       +
         androidsdk_extras = self.androidenv.androidsdk_7_1_1_extras;

     

       597
       597
        
       

     

       598
       598
        
         arc-theme = callPackage ../misc/themes/arc { };

     

       599
       599