Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .metadata
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# This file should be version controlled and should not be manually edited.

version:
revision: "3b62efc2a3da49882f43c372e0bc53daef7295a6"
revision: "nixpkgs000000000000000000000000000000000"
channel: "stable"

project_type: app
Expand All @@ -13,11 +13,11 @@ project_type: app
migration:
platforms:
- platform: root
create_revision: 3b62efc2a3da49882f43c372e0bc53daef7295a6
base_revision: 3b62efc2a3da49882f43c372e0bc53daef7295a6
create_revision: nixpkgs000000000000000000000000000000000
base_revision: nixpkgs000000000000000000000000000000000
- platform: web
create_revision: 3b62efc2a3da49882f43c372e0bc53daef7295a6
base_revision: 3b62efc2a3da49882f43c372e0bc53daef7295a6
create_revision: nixpkgs000000000000000000000000000000000
base_revision: nixpkgs000000000000000000000000000000000

# User provided section

Expand Down
83 changes: 80 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

79 changes: 63 additions & 16 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
description = "A beginning of an awesome project bootstrapped with github:bleur-org/templates";
description =
"A beginning of an awesome project bootstrapped with github:bleur-org/templates";

inputs = {
# Stable for keeping thins clean
Expand All @@ -10,31 +11,77 @@

# The flake-parts library
flake-parts.url = "github:hercules-ci/flake-parts";

android-nixpkgs = {
url = "github:tadfisher/android-nixpkgs";
inputs = { nixpkgs.follows = "nixpkgs"; };
};

};

outputs = {
self,
flake-parts,
...
} @ inputs:
flake-parts.lib.mkFlake {inherit inputs;} ({...}: {
systems = [
"x86_64-linux"
"aarch64-linux"
"x86_64-darwin"
"aarch64-darwin"
];
perSystem = {pkgs, ...}: {
outputs = { self, flake-parts, ... }@inputs:
flake-parts.lib.mkFlake { inherit inputs; } ({ ... }: {
systems =
[ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];

perSystem = { pkgs, system, ... }: {
_module.args.pkgs = import self.inputs.nixpkgs {
inherit system;
config.allowUnfree = true;
config.android_sdk.accept_license = true;
config.permittedInsecurePackages = [ "olm-3.2.16" ];
};

# Nix script formatter
formatter = pkgs.alejandra;

# Development environment
devShells.default = import ./nix/shell.nix self {inherit pkgs;};
devShells.default =
import ./nix/shell.nix self { inherit pkgs inputs; };

# devShells.default = let
# pkgs = import inputs.nixpkgs {
# inherit system;

# config = {
# android_sdk.accept_license = true;
# allowUnfree = true;
# };
# };
# buildToolsVersion = "35.0.0";
# androidComposition = pkgs.androidenv.composeAndroidPackages {
# buildToolsVersions = [ buildToolsVersion "28.0.3" ];
# platformVersions = [ "34" "28" "36" ];
# abiVersions = [ "armeabi-v7a" "arm64-v8a" ];
# includeNDK = true;
# ndkVersions = [ "28.2.13676358" ];
# cmakeVersions = [ "3.22.1" ];
# includeSources = false;
# includeSystemImages = false;
# includeEmulator = false;
# useGoogleAPIs = false;
# useGoogleTVAddOns = false;
# };

# androidSdk = androidComposition.androidsdk;

# in with pkgs;
# mkShell rec {
# ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk";
# JAVA_HOME = pkgs.jdk17;
# ANDROID_AVD_HOME = (toString ./.) + "/.android/avd";

# buildInputs = [
# flutter
# androidSdk # The customized SDK that we've made above
# jdk17
# ];
# };

# Output package
packages = {
default = pkgs.callPackage ./nix { };
web = pkgs.callPackage ./nix {targetFlutterPlatform = "web"; };
web = pkgs.callPackage ./nix { inherit inputs; targetFlutterPlatform = "web"; };
};
};
});
Expand Down
2 changes: 2 additions & 0 deletions macos/Flutter/GeneratedPluginRegistrant.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import flutter_webrtc
import geolocator_apple
import just_audio
import package_info_plus
import path_provider_foundation
import record_macos
import screen_retriever_macos
import share_plus
Expand Down Expand Up @@ -57,6 +58,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
GeolocatorPlugin.register(with: registry.registrar(forPlugin: "GeolocatorPlugin"))
JustAudioPlugin.register(with: registry.registrar(forPlugin: "JustAudioPlugin"))
FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
RecordMacOsPlugin.register(with: registry.registrar(forPlugin: "RecordMacOsPlugin"))
ScreenRetrieverMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverMacosPlugin"))
SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
Expand Down
Loading
Loading