commit 9c4e43ab70c506875684619f30d6d16f093e87d5 · pyrox.dev/nixpkgs

+5 -1

doc/languages-frameworks/android.section.md

···

       13
       13
        
       

     

       14
       14
        
       let

     

       15
       15
        
         androidComposition = androidenv.composeAndroidPackages {

     

       16
       16
       +
           cmdLineToolsVersion = "8.0";

     

       16
       17
        
           toolsVersion = "26.1.1";

     

       17
       18
        
           platformToolsVersion = "30.0.5";

     

       18
       19
        
           buildToolsVersions = [ "30.0.3" ];

     
···

       42
       43
        
       

     

       43
       44
        
       The following parameters are supported:

     

       44
       45
        
       

     

       45
       45
       -
       * `toolsVersion`, specifies the version of the tools package to use

     

       46
       46
       +
       * `cmdLineToolsVersion `, specifies the version of the `cmdline-tools` package to use

     

       47
       47
       +
       * `toolsVersion`, specifies the version of the `tools` package. Notice `tools` is

     

       48
       48
       +
         obsolete, and currently only `26.1.1` is available, so there's not a lot of

     

       49
       49
       +
         options here, however, you can set it as `null` if you don't want it.

     

       46
       50
        
       * `platformsToolsVersion` specifies the version of the `platform-tools` plugin

     

       47
       51
        
       * `buildToolsVersions` specifies the versions of the `build-tools` plugins to

     

       48
       52
        
         use.

pkgs/development/mobile/androidenv/README.md

···

       4
       4
        
       2. `./mkrepo.sh`

     

       5
       5
        
       3. Check the `repo.json` diff for new stable versions of `tools`, `platform-tools`, `build-tools`, `emulator` and/or `ndk`

     

       6
       6
        
       4. Update the relevant argument defaults in `compose-android-packages.nix`

     

       7
       7
       +
       

     

       8
       8
       +
       # How to run tests

     

       9
       9
       +
       You may need to make yourself familiar with [tests](https://nixos.org/manual/nixpkgs/stable/#var-meta-tests), and [Writing larger package tests](https://nixos.org/manual/nixpkgs/stable/#ssec-package-tests-writing) in the Manual, then run tests locally with:

     

       10
       10
       +
       

     

       11
       11
       +
       ```shell

     

       12
       12
       +
       $ export NIXPKGS_ALLOW_UNFREE=1

     

       13
       13
       +
       $ cd path/to/nixpkgs

     

       14
       14
       +
       $ nix-build -A androidenv.test-suite.tests

     

       15
       15
       +
       ```

+4 -2

pkgs/development/mobile/androidenv/build-tools.nix

···

       1
       1
       -
       {deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux}:

     

       1
       1
       +
       {deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux, postInstall}:

     

       2
       2
        
       

     

       3
       3
        
       deployAndroidPackage {

     

       4
       4
        
         inherit package os;

     
···

       19
       19
        
             wrapProgram $PWD/mainDexClasses \

     

       20
       20
        
               --prefix PATH : ${pkgs.jdk8}/bin

     

       21
       21
        
           ''}

     

       22
       22
       -
         '';

     

       22
       22
       +
       

     

       23
       23
       +
           cd $out/libexec/android-sdk

     

       24
       24
       +
         '' + postInstall;

     

       23
       25
        
         noAuditTmpdir = true; # The checker script gets confused by the build-tools path that is incorrectly identified as a reference to /build

     

       24
       26
        
       }

+39

pkgs/development/mobile/androidenv/cmdline-tools.nix

···

       1
       1
       +
       {deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, stdenv, cmdLineToolsVersion, postInstall}:

     

       2
       2
       +
       

     

       3
       3
       +
       deployAndroidPackage {

     

       4
       4
       +
         name = "androidsdk";

     

       5
       5
       +
         inherit package os;

     

       6
       6
       +
         nativeBuildInputs = [ makeWrapper ]

     

       7
       7
       +
           ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ];

     

       8
       8
       +
       

     

       9
       9
       +
         patchInstructions = ''

     

       10
       10
       +
           ${lib.optionalString (os == "linux") ''

     

       11
       11
       +
             # Auto patch all binaries

     

       12
       12
       +
             autoPatchelf .

     

       13
       13
       +
           ''}

     

       14
       14
       +
       

     

       15
       15
       +
           # Strip double dots from the root path

     

       16
       16
       +
           export ANDROID_SDK_ROOT="$out/libexec/android-sdk"

     

       17
       17
       +
       

     

       18
       18
       +
           # Wrap all scripts that require JAVA_HOME

     

       19
       19
       +
           find $ANDROID_SDK_ROOT/cmdline-tools/${cmdLineToolsVersion}/bin -maxdepth 1 -type f -executable | while read program; do

     

       20
       20
       +
             if grep -q "JAVA_HOME" $program; then

     

       21
       21
       +
               wrapProgram $program  --prefix PATH : ${pkgs.jdk11}/bin \

     

       22
       22
       +
                 --prefix ANDROID_SDK_ROOT : $ANDROID_SDK_ROOT

     

       23
       23
       +
             fi

     

       24
       24
       +
           done

     

       25
       25
       +
       

     

       26
       26
       +
           # Wrap sdkmanager script

     

       27
       27
       +
           wrapProgram $ANDROID_SDK_ROOT/cmdline-tools/${cmdLineToolsVersion}/bin/sdkmanager \

     

       28
       28
       +
             --prefix PATH : ${lib.makeBinPath [ pkgs.jdk11 ]} \

     

       29
       29
       +
             --add-flags "--sdk_root=$ANDROID_SDK_ROOT"

     

       30
       30
       +
       

     

       31
       31
       +
           # Patch all script shebangs

     

       32
       32
       +
           patchShebangs $ANDROID_SDK_ROOT/cmdline-tools/${cmdLineToolsVersion}/bin

     

       33
       33
       +
       

     

       34
       34
       +
           cd $ANDROID_SDK_ROOT

     

       35
       35
       +
           ${postInstall}

     

       36
       36
       +
         '';

     

       37
       37
       +
       

     

       38
       38
       +
         meta.license = lib.licenses.unfree;

     

       39
       39
       +
       }

+48 -27

pkgs/development/mobile/androidenv/compose-android-packages.nix

···

       2
       2
        
       , licenseAccepted ? false

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
       -
       { toolsVersion ? "26.1.1"

     

       5
       5
       +
       { cmdLineToolsVersion ? "8.0"

     

       6
       6
       +
       , toolsVersion ? "26.1.1"

     

       6
       7
        
       , platformToolsVersion ? "33.0.3"

     

       7
       8
        
       , buildToolsVersions ? [ "33.0.1" ]

     

       8
       9
        
       , includeEmulator ? false

     
···

       130
       131
        
           inherit deployAndroidPackage;

     

       131
       132
        
           os = if stdenv.system == "aarch64-darwin" then "macosx" else os; # "macosx" is a universal binary here

     

       132
       133
        
           package = packages.platform-tools.${platformToolsVersion};

     

       134
       134
       +
         };

     

       135
       135
       +
       

     

       136
       136
       +
         tools = callPackage ./tools.nix {

     

       137
       137
       +
           inherit deployAndroidPackage os;

     

       138
       138
       +
           package = packages.tools.${toolsVersion};

     

       139
       139
       +
       

     

       140
       140
       +
           postInstall = ''

     

       141
       141
       +
             ${linkPlugin { name = "platform-tools"; plugin = platform-tools; }}

     

       142
       142
       +
             ${linkPlugin { name = "patcher"; plugin = patcher; }}

     

       143
       143
       +
             ${linkPlugin { name = "emulator"; plugin = emulator; }}

     

       144
       144
       +
           '';

     

       145
       145
       +
         };

     

       146
       146
       +
       

     

       147
       147
       +
         patcher = callPackage ./patcher.nix {

     

       148
       148
       +
           inherit deployAndroidPackage os;

     

       149
       149
       +
           package = packages.patcher."1";

     

       133
       150
        
         };

     

       134
       151
        
       

     

       135
       152
        
         build-tools = map (version:

     

       136
       153
        
           callPackage ./build-tools.nix {

     

       137
       154
        
             inherit deployAndroidPackage os;

     

       138
       155
        
             package = packages.build-tools.${version};

     

       156
       156
       +
       

     

       157
       157
       +
             postInstall = ''

     

       158
       158
       +
               ${linkPlugin { name = "tools"; plugin = tools; check = toolsVersion != null; }}

     

       159
       159
       +
             '';

     

       139
       160
        
           }

     

       140
       161
        
         ) buildToolsVersions;

     

       141
       162
        
       

     

       142
       163
        
         emulator = callPackage ./emulator.nix {

     

       143
       164
        
           inherit deployAndroidPackage os;

     

       144
       165
        
           package = packages.emulator.${emulatorVersion};

     

       166
       166
       +
       

     

       167
       167
       +
           postInstall = ''

     

       168
       168
       +
             ${linkSystemImages { images = system-images; check = includeSystemImages; }}

     

       169
       169
       +
           '';

     

       145
       170
        
         };

     

       146
       171
        
       

     

       147
       172
        
         platforms = map (version:

     
···

       238
       263
        
         # Function that automatically links a plugin for which only one version exists

     

       239
       264
        
         linkPlugin = {name, plugin, check ? true}:

     

       240
       265
        
           lib.optionalString check ''

     

       241
       241
       -
             ln -s ${plugin}/libexec/android-sdk/* ${name}

     

       266
       266
       +
             ln -s ${plugin}/libexec/android-sdk/${name} ${name}

     

       242
       267
        
           '';

     

       243
       268
        
       

     

       269
       269
       +
         linkSystemImages = { images, check }: lib.optionalString check ''

     

       270
       270
       +
           mkdir -p system-images

     

       271
       271
       +
           ${lib.concatMapStrings (system-image: ''

     

       272
       272
       +
             apiVersion=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*))

     

       273
       273
       +
             type=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*/*))

     

       274
       274
       +
             mkdir -p system-images/$apiVersion/$type

     

       275
       275
       +
             ln -s ${system-image}/libexec/android-sdk/system-images/$apiVersion/$type/* system-images/$apiVersion/$type

     

       276
       276
       +
           '') images}

     

       277
       277
       +
         '';

     

       278
       278
       +
       

     

       244
       279
        
         # Links all plugins related to a requested platform

     

       245
       280
        
         linkPlatformPlugins = {name, plugins, check}:

     

       246
       281
        
           lib.optionalString check ''

     
···

       260
       295
        
           ${lib.concatMapStringsSep "\n" (str: "  - ${str}") licenseNames}

     

       261
       296
        
       

     

       262
       297
        
           by setting nixpkgs config option 'android_sdk.accept_license = true;'.

     

       263
       263
       -
         '' else callPackage ./tools.nix {

     

       264
       264
       -
           inherit deployAndroidPackage packages toolsVersion os;

     

       298
       298
       +
         '' else callPackage ./cmdline-tools.nix {

     

       299
       299
       +
           inherit deployAndroidPackage os cmdLineToolsVersion;

     

       300
       300
       +
       

     

       301
       301
       +
           package = packages.cmdline-tools.${cmdLineToolsVersion};

     

       265
       302
        
       

     

       266
       303
        
           postInstall = ''

     

       267
       304
        
             # Symlink all requested plugins

     

       268
       305
        
             ${linkPlugin { name = "platform-tools"; plugin = platform-tools; }}

     

       306
       306
       +
             ${linkPlugin { name = "tools"; plugin = tools; check = toolsVersion != null; }}

     

       307
       307
       +
             ${linkPlugin { name = "patcher"; plugin = patcher; }}

     

       269
       308
        
             ${linkPlugins { name = "build-tools"; plugins = build-tools; }}

     

       270
       309
        
             ${linkPlugin { name = "emulator"; plugin = emulator; check = includeEmulator; }}

     

       271
       310
        
             ${linkPlugins { name = "platforms"; plugins = platforms; }}

     
···

       273
       312
        
             ${linkPlugins { name = "cmake"; plugins = cmake; }}

     

       274
       313
        
             ${linkNdkPlugins { name = "ndk-bundle"; rootName = "ndk"; plugins = ndk-bundles; }}

     

       275
       314
        
             ${linkNdkPlugin { name = "ndk-bundle"; plugin = ndk-bundle; check = includeNDK; }}

     

       276
       276
       -
       

     

       277
       277
       -
             ${lib.optionalString includeSystemImages ''

     

       278
       278
       -
               mkdir -p system-images

     

       279
       279
       -
               ${lib.concatMapStrings (system-image: ''

     

       280
       280
       -
                 apiVersion=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*))

     

       281
       281
       -
                 type=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*/*))

     

       282
       282
       -
                 mkdir -p system-images/$apiVersion/$type

     

       283
       283
       -
                 ln -s ${system-image}/libexec/android-sdk/system-images/$apiVersion/$type/* system-images/$apiVersion/$type

     

       284
       284
       -
               '') system-images}

     

       285
       285
       -
             ''}

     

       286
       286
       -
       

     

       315
       315
       +
             ${linkSystemImages { images = system-images; check = includeSystemImages; }}

     

       287
       316
        
             ${linkPlatformPlugins { name = "add-ons"; plugins = google-apis; check = useGoogleAPIs; }}

     

       288
       317
        
             ${linkPlatformPlugins { name = "add-ons"; plugins = google-apis; check = useGoogleTVAddOns; }}

     

       289
       318
        
       

     
···

       304
       333
        
       

     

       305
       334
        
             # Expose common executables in bin/

     

       306
       335
        
             mkdir -p $out/bin

     

       307
       307
       -
             find $PWD/tools -not -path '*/\.*' -type f -executable -mindepth 1 -maxdepth 1 | while read i

     

       308
       308
       -
             do

     

       336
       336
       +
       

     

       337
       337
       +
             for i in ${platform-tools}/bin/*; do

     

       309
       338
        
                 ln -s $i $out/bin

     

       310
       339
        
             done

     

       311
       340
        
       

     

       312
       312
       -
             find $PWD/tools/bin -not -path '*/\.*' -type f -executable -mindepth 1 -maxdepth 1 | while read i

     

       313
       313
       -
             do

     

       341
       341
       +
             for i in ${emulator}/bin/*; do

     

       314
       342
        
                 ln -s $i $out/bin

     

       315
       343
        
             done

     

       316
       344
        
       

     

       317
       317
       -
             for i in ${platform-tools}/bin/*

     

       318
       318
       -
             do

     

       345
       345
       +
             find $ANDROID_SDK_ROOT/cmdline-tools/${cmdLineToolsVersion}/bin -type f -executable | while read i; do

     

       319
       346
        
                 ln -s $i $out/bin

     

       320
       347
        
             done

     

       321
       321
       -
       

     

       322
       322
       -
             # the emulator auto-linked from platform-tools does not find its local qemu, while this one does

     

       323
       323
       -
             ${lib.optionalString includeEmulator ''

     

       324
       324
       -
               rm $out/bin/emulator

     

       325
       325
       -
               ln -s $out/libexec/android-sdk/emulator/emulator $out/bin

     

       326
       326
       -
             ''}

     

       327
       348
        
       

     

       328
       349
        
             # Write licenses

     

       329
       350
        
             mkdir -p licenses

pkgs/development/mobile/androidenv/default.nix

···

       19
       19
        
           platformVersions = [ "28" ];

     

       20
       20
        
           abiVersions = [ "x86" "x86_64"];

     

       21
       21
        
         };

     

       22
       22
       +
       

     

       23
       23
       +
         test-suite = pkgs.callPackage ./test-suite.nix {};

     

       22
       24
        
       }

+10 -1

pkgs/development/mobile/androidenv/emulator.nix

···

       1
       1
       -
       { deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux }:

     

       1
       1
       +
       { deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux, postInstall }:

     

       2
       2
        
       

     

       3
       3
        
       deployAndroidPackage {

     

       4
       4
        
         inherit package os;

     
···

       47
       47
        
             ]} \

     

       48
       48
        
             --set QT_XKB_CONFIG_ROOT ${pkgs.xkeyboard_config}/share/X11/xkb \

     

       49
       49
        
             --set QTCOMPOSE ${pkgs.xorg.libX11.out}/share/X11/locale

     

       50
       50
       +
       

     

       51
       51
       +
           mkdir -p $out/bin

     

       52
       52
       +
           cd $out/bin

     

       53
       53
       +
           find $out/libexec/android-sdk/emulator -type f -executable -mindepth 1 -maxdepth 1 | while read i; do

     

       54
       54
       +
             ln -s $i

     

       55
       55
       +
           done

     

       56
       56
       +
       

     

       57
       57
       +
           cd $out/libexec/android-sdk

     

       58
       58
       +
           ${postInstall}

     

       50
       59
        
         '';

     

       51
       60
        
         dontMoveLib64 = true;

     

       52
       61
        
       }

+51 -7

pkgs/development/mobile/androidenv/examples/shell.nix

···

       25
       25
        
         # versions may be used in multiple places in this Nix expression.

     

       26
       26
        
         android = {

     

       27
       27
        
           versions = {

     

       28
       28
       -
             tools = "26.1.1";

     

       28
       28
       +
             cmdLineToolsVersion = "8.0";

     

       29
       29
        
             platformTools = "33.0.3";

     

       30
       30
        
             buildTools = "30.0.3";

     

       31
       31
        
             ndk = [

     
···

       60
       60
        
         };

     

       61
       61
        
       

     

       62
       62
        
         androidComposition = androidEnv.composeAndroidPackages {

     

       63
       63
       -
           toolsVersion = android.versions.tools;

     

       63
       63
       +
           cmdLineToolsVersion = android.versions.cmdLineToolsVersion;

     

       64
       64
        
           platformToolsVersion = android.versions.platformTools;

     

       65
       65
        
           buildToolsVersions = [android.versions.buildTools];

     

       66
       66
        
           platformVersions = android.platforms;

     
···

       138
       138
        
       

     

       139
       139
        
           # Write out local.properties for Android Studio.

     

       140
       140
        
           cat <<EOF > local.properties

     

       141
       141
       -
       # This file was automatically generated by nix-shell.

     

       142
       142
       -
       sdk.dir=$ANDROID_SDK_ROOT

     

       143
       143
       -
       ndk.dir=$ANDROID_NDK_ROOT

     

       144
       144
       -
       cmake.dir=$cmake_root

     

       145
       145
       -
       EOF

     

       141
       141
       +
           # This file was automatically generated by nix-shell.

     

       142
       142
       +
           sdk.dir=$ANDROID_SDK_ROOT

     

       143
       143
       +
           ndk.dir=$ANDROID_NDK_ROOT

     

       144
       144
       +
           cmake.dir=$cmake_root

     

       145
       145
       +
           EOF

     

       146
       146
        
         '';

     

       147
       147
       +
       

     

       148
       148
       +
         passthru.tests = {

     

       149
       149
       +
           sdkmanager-licenses-test = pkgs.runCommand "sdkmanager-licenses-test" {

     

       150
       150
       +
             buildInputs = [ androidSdk jdk ];

     

       151
       151
       +
           } ''

     

       152
       152
       +
             if [[ ! "$(sdkmanager --licenses)" =~ "All SDK package licenses accepted." ]]; then

     

       153
       153
       +
               echo "At least one of SDK package licenses are not accepted."

     

       154
       154
       +
               exit 1

     

       155
       155
       +
             fi

     

       156
       156
       +
             touch $out

     

       157
       157
       +
           '';

     

       158
       158
       +
       

     

       159
       159
       +
           sdkmanager-packages-test = pkgs.runCommand "sdkmanager-packages-test" {

     

       160
       160
       +
             buildInputs = [ androidSdk jdk ];

     

       161
       161
       +
           } ''

     

       162
       162
       +
             output="$(sdkmanager --list)"

     

       163
       163
       +
             installed_packages_section=$(echo "''${output%%Available Packages*}" | awk 'NR>4 {print $1}')

     

       164
       164
       +
       

     

       165
       165
       +
             packages=(

     

       166
       166
       +
               "build-tools;30.0.3" "ndk-bundle" "platform-tools" \

     

       167
       167
       +
               "platforms;android-23" "platforms;android-24" "platforms;android-25" "platforms;android-26" \

     

       168
       168
       +
               "platforms;android-27" "platforms;android-28" "platforms;android-29" "platforms;android-30" \

     

       169
       169
       +
               "platforms;android-31" "platforms;android-32" "platforms;android-33" \

     

       170
       170
       +
               "sources;android-23" "sources;android-24" "sources;android-25" "sources;android-26" \

     

       171
       171
       +
               "sources;android-27" "sources;android-28" "sources;android-29" "sources;android-30" \

     

       172
       172
       +
               "sources;android-31" "sources;android-32" "sources;android-33" \

     

       173
       173
       +
               "system-images;android-28;google_apis_playstore;arm64-v8a" \

     

       174
       174
       +
               "system-images;android-29;google_apis_playstore;arm64-v8a" \

     

       175
       175
       +
               "system-images;android-30;google_apis_playstore;arm64-v8a" \

     

       176
       176
       +
               "system-images;android-31;google_apis_playstore;arm64-v8a" \

     

       177
       177
       +
               "system-images;android-32;google_apis_playstore;arm64-v8a" \

     

       178
       178
       +
               "system-images;android-33;google_apis_playstore;arm64-v8a"

     

       179
       179
       +
             )

     

       180
       180
       +
       

     

       181
       181
       +
             for package in "''${packages[@]}"; do

     

       182
       182
       +
               if [[ ! $installed_packages_section =~ "$package" ]]; then

     

       183
       183
       +
                 echo "$package package was not installed."

     

       184
       184
       +
                 exit 1

     

       185
       185
       +
               fi

     

       186
       186
       +
             done

     

       187
       187
       +
       

     

       188
       188
       +
             touch "$out"

     

       189
       189
       +
           '';

     

       190
       190
       +
         };

     

       147
       191
        
       }

     

       148
       192

pkgs/development/mobile/androidenv/patcher.nix

···

       1
       1
       +
       {deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs, stdenv}:

     

       2
       2
       +
       

     

       3
       3
       +
       deployAndroidPackage {

     

       4
       4
       +
         inherit package os;

     

       5
       5
       +
         nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];

     

       6
       6
       +
         patchInstructions = lib.optionalString (os == "linux") ''

     

       7
       7
       +
           autoPatchelf $packageBaseDir/bin

     

       8
       8
       +
         '';

     

       9
       9
       +
       }

pkgs/development/mobile/androidenv/platform-tools.nix

···

       4
       4
        
         inherit package os;

     

       5
       5
        
         nativeBuildInputs = lib.optionals (os == "linux") [ autoPatchelfHook ];

     

       6
       6
        
         buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 ];

     

       7
       7
       +
       

     

       7
       8
        
         patchInstructions = lib.optionalString (os == "linux") ''

     

       8
       9
        
           addAutoPatchelfSearchPath $packageBaseDir/lib64

     

       9
       10
        
           autoPatchelf --no-recurse $packageBaseDir/lib64

+16

pkgs/development/mobile/androidenv/test-suite.nix

···

       1
       1
       +
       { stdenv, callPackage }:

     

       2
       2
       +
       let

     

       3
       3
       +
         examples-shell = callPackage ./examples/shell.nix {};

     

       4
       4
       +
       in

     

       5
       5
       +
       stdenv.mkDerivation {

     

       6
       6
       +
         name = "androidenv-test-suite";

     

       7
       7
       +
       

     

       8
       8
       +
         src = ./.;

     

       9
       9
       +
       

     

       10
       10
       +
         dontConfigure = true;

     

       11
       11
       +
         dontBuild = true;

     

       12
       12
       +
       

     

       13
       13
       +
         passthru.tests = { } // examples-shell.passthru.tests;

     

       14
       14
       +
       

     

       15
       15
       +
         meta.timeout = 60;

     

       16
       16
       +
       }

+40 -24

pkgs/development/mobile/androidenv/tools.nix

···

       1
       1
       -
       {deployAndroidPackage, requireFile, lib, packages, toolsVersion, os, callPackage, postInstall ? ""}:

     

       1
       1
       +
       {deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, postInstall}:

     

       2
       2
        
       

     

       3
       3
       -
       if toolsVersion == "26.0.1" then callPackage ./tools/26.nix {

     

       4
       4
       -
         inherit deployAndroidPackage lib os postInstall;

     

       5
       5
       -
         package = {

     

       6
       6
       -
           name = "tools";

     

       7
       7
       -
           path = "tools";

     

       8
       8
       -
           revision = "26.0.1";

     

       9
       9
       -
           archives = {

     

       10
       10
       -
             linux = requireFile {

     

       11
       11
       -
               url = "https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip";

     

       12
       12
       -
               sha256 = "185yq7qwxflw24ccm5d6zziwlc9pxmsm3f54pm9p7xm0ik724kj4";

     

       13
       13
       -
             };

     

       14
       14
       -
             macosx = requireFile {

     

       15
       15
       -
               url = "https://dl.google.com/android/repository/sdk-tools-darwin-3859397.zip";

     

       16
       16
       -
               sha256 = "1ycx9gzdaqaw6n19yvxjawywacavn1jc6sadlz5qikhgfr57b0aa";

     

       17
       17
       -
             };

     

       18
       18
       -
           };

     

       19
       19
       -
         };

     

       20
       20
       -
       } else if toolsVersion == "26.1.1" then callPackage ./tools/26.nix {

     

       21
       21
       -
         inherit deployAndroidPackage lib os postInstall;

     

       22
       22
       -
         package = packages.tools.${toolsVersion};

     

       23
       23
       -
       } else callPackage ./tools/25.nix {

     

       24
       24
       -
         inherit deployAndroidPackage lib os postInstall;

     

       25
       25
       -
         package = packages.tools.${toolsVersion};

     

       3
       3
       +
       deployAndroidPackage {

     

       4
       4
       +
         name = "androidsdk";

     

       5
       5
       +
         inherit os package;

     

       6
       6
       +
         nativeBuildInputs = [ makeWrapper ]

     

       7
       7
       +
           ++ lib.optionals (os == "linux") [ autoPatchelfHook ];

     

       8
       8
       +
         buildInputs = lib.optional (os == "linux") (

     

       9
       9
       +
             (with pkgs; [ glibc freetype fontconfig fontconfig.lib])

     

       10
       10
       +
             ++ (with pkgs.xorg; [ libX11 libXrender libXext ])

     

       11
       11
       +
             ++ (with pkgsi686Linux; [ glibc xorg.libX11 xorg.libXrender xorg.libXext fontconfig.lib freetype zlib ])

     

       12
       12
       +
           );

     

       13
       13
       +
       

     

       14
       14
       +
         patchInstructions = ''

     

       15
       15
       +
           ${lib.optionalString (os == "linux") ''

     

       16
       16
       +
             # Auto patch all binaries

     

       17
       17
       +
             autoPatchelf .

     

       18
       18
       +
           ''}

     

       19
       19
       +
       

     

       20
       20
       +
           # Wrap all scripts that require JAVA_HOME

     

       21
       21
       +
           for i in bin; do

     

       22
       22
       +
             find $i -maxdepth 1 -type f -executable | while read program; do

     

       23
       23
       +
               if grep -q "JAVA_HOME" $program; then

     

       24
       24
       +
                 wrapProgram $PWD/$program --prefix PATH : ${pkgs.jdk8}/bin

     

       25
       25
       +
               fi

     

       26
       26
       +
             done

     

       27
       27
       +
           done

     

       28
       28
       +
       

     

       29
       29
       +
           # Wrap monitor script

     

       30
       30
       +
           wrapProgram $PWD/monitor \

     

       31
       31
       +
             --prefix PATH : ${pkgs.jdk8}/bin \

     

       32
       32
       +
             --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath (with pkgs; [ xorg.libX11 xorg.libXtst ])}

     

       33
       33
       +
       

     

       34
       34
       +
           # Patch all script shebangs

     

       35
       35
       +
           patchShebangs .

     

       36
       36
       +
       

     

       37
       37
       +
           cd $out/libexec/android-sdk

     

       38
       38
       +
           ${postInstall}

     

       39
       39
       +
         '';

     

       40
       40
       +
       

     

       41
       41
       +
         meta.license = lib.licenses.unfree;

     

       26
       42
        
       }

-62

pkgs/development/mobile/androidenv/tools/25.nix

···

       1
       1
       -
       {deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, postInstall ? ""}:

     

       2
       2
       -
       

     

       3
       3
       -
       deployAndroidPackage {

     

       4
       4
       -
         name = "androidsdk";

     

       5
       5
       -
         nativeBuildInputs = [ autoPatchelfHook makeWrapper ];

     

       6
       6
       -
         buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.xorg.libX11 pkgs.xorg.libXext pkgs.xorg.libXdamage pkgs.xorg.libxcb pkgs.xorg.libXfixes pkgs.xorg.libXrender pkgs.fontconfig.lib pkgs.freetype pkgs.libGL pkgs.zlib pkgs.ncurses5 pkgs.libpulseaudio pkgsi686Linux.glibc pkgsi686Linux.xorg.libX11 pkgsi686Linux.xorg.libXrender pkgsi686Linux.fontconfig pkgsi686Linux.freetype pkgsi686Linux.zlib ];

     

       7
       7
       -
         inherit package os;

     

       8
       8
       -
       

     

       9
       9
       -
         patchInstructions = ''

     

       10
       10
       -
           ${lib.optionalString (os == "linux") ''

     

       11
       11
       -
             # Auto patch all binaries

     

       12
       12
       -
             addAutoPatchelfSearchPath $PWD/lib64

     

       13
       13
       -
             addAutoPatchelfSearchPath $PWD/lib64/libstdc++

     

       14
       14
       -
             addAutoPatchelfSearchPath $PWD/lib64/qt/lib

     

       15
       15
       -
             addAutoPatchelfSearchPath $PWD/lib

     

       16
       16
       -
             addAutoPatchelfSearchPath $PWD/lib/libstdc++

     

       17
       17
       -
             autoPatchelf .

     

       18
       18
       -
           ''}

     

       19
       19
       -
       

     

       20
       20
       -
           # Wrap all scripts that require JAVA_HOME

     

       21
       21
       -
           for i in bin

     

       22
       22
       -
           do

     

       23
       23
       -
               find $i -maxdepth 1 -type f -executable | while read program

     

       24
       24
       -
               do

     

       25
       25
       -
                   if grep -q "JAVA_HOME" $program

     

       26
       26
       -
                   then

     

       27
       27
       -
                       wrapProgram $PWD/$program --prefix PATH : ${pkgs.jdk8}/bin

     

       28
       28
       -
                   fi

     

       29
       29
       -
               done

     

       30
       30
       -
           done

     

       31
       31
       -
       

     

       32
       32
       -
           # Wrap programs that require java

     

       33
       33
       -
           for i in draw9patch jobb lint screenshot2

     

       34
       34
       -
           do

     

       35
       35
       -
               wrapProgram $PWD/$i \

     

       36
       36
       -
                 --prefix PATH : ${pkgs.jdk8}/bin

     

       37
       37
       -
           done

     

       38
       38
       -
       

     

       39
       39
       -
           # Wrap programs that require java and SWT

     

       40
       40
       -
           for i in android ddms hierarchyviewer monitor monkeyrunner traceview uiautomatorviewer

     

       41
       41
       -
           do

     

       42
       42
       -
               wrapProgram $PWD/$i \

     

       43
       43
       -
                 --prefix PATH : ${pkgs.jdk8}/bin \

     

       44
       44
       -
                 --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xorg.libX11 pkgs.xorg.libXtst ]}

     

       45
       45
       -
           done

     

       46
       46
       -
       

     

       47
       47
       -
           ${lib.optionalString (os == "linux") ''

     

       48
       48
       -
             wrapProgram $PWD/emulator \

     

       49
       49
       -
               --prefix PATH : ${pkgs.file}/bin:${pkgs.glxinfo}/bin:${pkgs.pciutils}/bin \

     

       50
       50
       -
               --set QT_XKB_CONFIG_ROOT ${pkgs.xkeyboard_config}/share/X11/xkb \

     

       51
       51
       -
               --set QTCOMPOSE ${pkgs.xorg.libX11.out}/share/X11/locale

     

       52
       52
       -
           ''}

     

       53
       53
       -
       

     

       54
       54
       -
           # Patch all script shebangs

     

       55
       55
       -
           patchShebangs .

     

       56
       56
       -
       

     

       57
       57
       -
           cd ..

     

       58
       58
       -
           ${postInstall}

     

       59
       59
       -
         '';

     

       60
       60
       -
       

     

       61
       61
       -
         meta.license = lib.licenses.unfree;

     

       62
       62
       -
       }

-45

pkgs/development/mobile/androidenv/tools/26.nix

···

       1
       1
       -
       {deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, postInstall ? ""}:

     

       2
       2
       -
       

     

       3
       3
       -
       deployAndroidPackage {

     

       4
       4
       -
         name = "androidsdk";

     

       5
       5
       -
         inherit os package;

     

       6
       6
       -
         nativeBuildInputs = [ makeWrapper ]

     

       7
       7
       -
           ++ lib.optionals (os == "linux") [ autoPatchelfHook ];

     

       8
       8
       -
         buildInputs = lib.optional (os == "linux") (

     

       9
       9
       -
             (with pkgs; [ glibc freetype fontconfig fontconfig.lib])

     

       10
       10
       -
             ++ (with pkgs.xorg; [ libX11 libXrender libXext ])

     

       11
       11
       -
             ++ (with pkgsi686Linux; [ glibc xorg.libX11 xorg.libXrender xorg.libXext fontconfig.lib freetype zlib ])

     

       12
       12
       -
           );

     

       13
       13
       -
       

     

       14
       14
       -
         patchInstructions = ''

     

       15
       15
       -
           ${lib.optionalString (os == "linux") ''

     

       16
       16
       -
             # Auto patch all binaries

     

       17
       17
       -
             autoPatchelf .

     

       18
       18
       -
           ''}

     

       19
       19
       -
       

     

       20
       20
       -
           # Wrap all scripts that require JAVA_HOME

     

       21
       21
       -
           for i in bin

     

       22
       22
       -
           do

     

       23
       23
       -
               find $i -maxdepth 1 -type f -executable | while read program

     

       24
       24
       -
               do

     

       25
       25
       -
                   if grep -q "JAVA_HOME" $program

     

       26
       26
       -
                   then

     

       27
       27
       -
                       wrapProgram $PWD/$program --prefix PATH : ${pkgs.jdk8}/bin

     

       28
       28
       -
                   fi

     

       29
       29
       -
               done

     

       30
       30
       -
           done

     

       31
       31
       -
       

     

       32
       32
       -
           # Wrap monitor script

     

       33
       33
       -
           wrapProgram $PWD/monitor \

     

       34
       34
       -
             --prefix PATH : ${pkgs.jdk8}/bin \

     

       35
       35
       -
             --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xorg.libX11 pkgs.xorg.libXtst ]}

     

       36
       36
       -
       

     

       37
       37
       -
           # Patch all script shebangs

     

       38
       38
       -
           patchShebangs .

     

       39
       39
       -
       

     

       40
       40
       -
           cd ..

     

       41
       41
       -
           ${postInstall}

     

       42
       42
       -
         '';

     

       43
       43
       -
       

     

       44
       44
       -
         meta.license = lib.licenses.unfree;

     

       45
       45
       -
       }