final version of ci spec

pull/110/head
Alya Sirko 2022-08-27 18:22:58 +03:00
parent 856e26bd9e
commit 53ef810a09
2 changed files with 5 additions and 6 deletions

View File

@ -9,5 +9,5 @@ steps:
#- nix-shell --pure --run "dart --version" #- nix-shell --pure --run "dart --version"
- nix-shell --pure --run "flutter build apk --split-per-abi" - nix-shell --pure --run "flutter build apk --split-per-abi"
environment: environment:
NIX_PATH: "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos" NIX_PATH: "unstable=/nix/var/nix/profiles/per-user/root/channels/unstable"
NIXPKGS_ALLOW_UNFREE: 1 NIXPKGS_ALLOW_UNFREE: 1

View File

@ -1,16 +1,15 @@
{ pkgs ? import <nixpkgs> { config.android_sdk.accept_license = true; } }: { pkgs ? import <unstable> { config.android_sdk.accept_license = true; } }:
let let
unstable = import (fetchTarball "https://nixos.org/channels/nixpkgs-unstable/nixexprs.tar.xz") {};
androidComposition = pkgs.androidenv.composeAndroidPackages { androidComposition = pkgs.androidenv.composeAndroidPackages {
toolsVersion = "26.1.1"; toolsVersion = "26.1.1";
platformToolsVersion = "33.0.2"; platformToolsVersion = "33.0.2";
buildToolsVersions = [ "33.0.0" ]; buildToolsVersions = [ "30.0.3" ];
platformVersions = [ "31" "30" "29" ];
}; };
in in
pkgs.mkShell { pkgs.mkShell {
ANDROID_HOME= "${androidComposition.androidsdk}/libexec/android-sdk"; ANDROID_HOME= "${androidComposition.androidsdk}/libexec/android-sdk";
ANDROID_SDK_ROOT = "${androidComposition.androidsdk}/libexec/android-sdk"; ANDROID_SDK_ROOT = "${androidComposition.androidsdk}/libexec/android-sdk";
nativeBuildInputs = with pkgs; [ unstable.flutter openjdk11_headless ]; nativeBuildInputs = with pkgs; [ flutter openjdk11_headless ];
} }