From a4d3d248a5707eecc3b99b9349108e7a10656fd8 Mon Sep 17 00:00:00 2001 From: Leah Date: Wed, 11 Feb 2026 17:11:00 +0100 Subject: [PATCH 1/5] Add flake.nix for development environment --- flake.nix | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 flake.nix diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..e30165e --- /dev/null +++ b/flake.nix @@ -0,0 +1,116 @@ +{ + description = "MeshCore Flutter Application"; + + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + flake-utils.url = "github:numtide/flake-utils"; + }; + + outputs = { self, nixpkgs, flake-utils }: + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = nixpkgs.legacyPackages.${system}; + in + { + devShells.default = pkgs.mkShell { + buildInputs = with pkgs; [ + # Flutter and Dart + flutter + dart + + # Java (required for Android development) + jdk17 + + # Android development tools + android-tools + gradle + + # iOS development (macOS only) + ] ++ ( + if pkgs.stdenv.isDarwin then + with pkgs.darwin.apple_sdk.frameworks; [ + Cocoa + Security + IOKit + ] + else + [] + ) ++ [ + # Common development tools + git + curl + wget + pkg-config + + # Build tools + cmake + ninja + clang + llvm + # Linux desktop development + gtk3 + glib + libdatrie + sysprof + xorg.libX11 + xorg.libXext + xorg.libXrender + xorg.libXinerama + xorg.libXcursor + xorg.libXi + xorg.libXrandr + xorg.libXdamage + # Optional: testing + lcov + ]; + + shellHook = '' + echo "MeshCore Flutter Development Environment" + export PKG_CONFIG_PATH="${pkgs.gtk3}/lib/pkgconfig:${pkgs.glib}/lib/pkgconfig:${pkgs.sysprof}/lib/pkgconfig:$PKG_CONFIG_PATH" + export LD_LIBRARY_PATH="${pkgs.lib.makeLibraryPath [pkgs.gtk3 pkgs.glib pkgs.sysprof pkgs.libdatrie]}:$LD_LIBRARY_PATH" + export CMAKE_INSTALL_PREFIX="$PWD/build/bundle" + mkdir -p "$PWD/build/bundle" + + # Setup Android SDK in home directory (standard location) + export ANDROID_HOME="$HOME/Android/Sdk" + export ANDROID_SDK_ROOT="$ANDROID_HOME" + export PATH="$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools/bin:$PATH" + + # Use gradle wrapper + export GRADLE_USER_HOME="$PWD/.gradle" + + echo "Android SDK: $ANDROID_HOME" + echo "Gradle Home: $GRADLE_USER_HOME" + echo "" + + # Check if Android SDK exists and offer to download if not + if [ ! -d "$ANDROID_HOME" ]; then + echo "WARNING: Android SDK not found at $ANDROID_HOME" + echo "" + echo "To download and set up the Android SDK, run this command:" + echo "" + cat << 'EOF' +mkdir -p ~/Android/Sdk && cd ~/Android/Sdk && \ +curl -o cmdline-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-10406996_latest.zip && \ +unzip -q cmdline-tools.zip && \ +mkdir -p cmdline-tools/latest && \ +mv cmdline-tools/* cmdline-tools/latest/ 2>/dev/null || true && \ +rm cmdline-tools.zip && \ +cd cmdline-tools/latest/bin && \ +yes | ./sdkmanager --sdk_root=~/Android/Sdk 'platform-tools' 'platforms;android-34' 'build-tools;34.0.0' && \ +echo "Android SDK setup complete!" +EOF + echo "" + echo "Then run 'flutter doctor' again to verify." + echo "" + else + echo "Android SDK found at $ANDROID_HOME" + fi + + echo "Running flutter doctor..." + flutter doctor + ''; + }; + } + ); +} From 4afab3f62946a3f76cad918f8dfae017575a62e2 Mon Sep 17 00:00:00 2001 From: Leah Date: Wed, 11 Feb 2026 17:25:44 +0100 Subject: [PATCH 2/5] remove unnessisary bits and nix darwin stuff --- flake.nix | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/flake.nix b/flake.nix index e30165e..68f7bca 100644 --- a/flake.nix +++ b/flake.nix @@ -24,44 +24,6 @@ # Android development tools android-tools gradle - - # iOS development (macOS only) - ] ++ ( - if pkgs.stdenv.isDarwin then - with pkgs.darwin.apple_sdk.frameworks; [ - Cocoa - Security - IOKit - ] - else - [] - ) ++ [ - # Common development tools - git - curl - wget - pkg-config - - # Build tools - cmake - ninja - clang - llvm - # Linux desktop development - gtk3 - glib - libdatrie - sysprof - xorg.libX11 - xorg.libXext - xorg.libXrender - xorg.libXinerama - xorg.libXcursor - xorg.libXi - xorg.libXrandr - xorg.libXdamage - # Optional: testing - lcov ]; shellHook = '' From dfd38b19e9b3a4639c578abe16442cac81c6900c Mon Sep 17 00:00:00 2001 From: Leah Date: Wed, 11 Feb 2026 17:26:43 +0100 Subject: [PATCH 3/5] add flake.lock --- flake.lock | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 flake.lock diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..4d0355b --- /dev/null +++ b/flake.lock @@ -0,0 +1,61 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} From aa350aa4aecbbf92132d293ac7f77c49d8b6906c Mon Sep 17 00:00:00 2001 From: Leah Date: Wed, 11 Feb 2026 17:33:31 +0100 Subject: [PATCH 4/5] fixing copilot issues --- flake.nix | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 68f7bca..841f553 100644 --- a/flake.nix +++ b/flake.nix @@ -24,6 +24,19 @@ # Android development tools android-tools gradle + + # For the shell hook to set up the environment for Flutter development + gtk3 + glib + sysprof + libclang + cmake + ninja + pkg-config + + # Additional tools for installing Android SDK if not present + curl + unzip ]; shellHook = '' @@ -53,10 +66,10 @@ echo "" cat << 'EOF' mkdir -p ~/Android/Sdk && cd ~/Android/Sdk && \ -curl -o cmdline-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-10406996_latest.zip && \ +curl -o cmdline-tools.zip ${if pkgs.stdenv.isDarwin then "https://dl.google.com/android/repository/commandlinetools-mac-10406996_latest.zip" else "https://dl.google.com/android/repository/commandlinetools-linux-10406996_latest.zip"} && \ unzip -q cmdline-tools.zip && \ mkdir -p cmdline-tools/latest && \ -mv cmdline-tools/* cmdline-tools/latest/ 2>/dev/null || true && \ +mv cmdline-tools/* cmdline-tools/latest/ 2>/dev/null || echo "Warning: failed to move Android cmdline-tools into 'latest' directory; please check your SDK layout." >&2 && \ rm cmdline-tools.zip && \ cd cmdline-tools/latest/bin && \ yes | ./sdkmanager --sdk_root=~/Android/Sdk 'platform-tools' 'platforms;android-34' 'build-tools;34.0.0' && \ @@ -69,8 +82,7 @@ EOF echo "Android SDK found at $ANDROID_HOME" fi - echo "Running flutter doctor..." - flutter doctor + echo "To check that everything is set up correctly, run 'flutter doctor' and ensure there are no issues." ''; }; } From 4e6e7b60611292429470e7b3a093e8e8d8647e5c Mon Sep 17 00:00:00 2001 From: Leah Date: Wed, 11 Feb 2026 17:45:15 +0100 Subject: [PATCH 5/5] fix smaller copilot issues --- flake.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 841f553..1671145 100644 --- a/flake.nix +++ b/flake.nix @@ -33,6 +33,7 @@ cmake ninja pkg-config + libdatrie # Additional tools for installing Android SDK if not present curl @@ -44,18 +45,13 @@ export PKG_CONFIG_PATH="${pkgs.gtk3}/lib/pkgconfig:${pkgs.glib}/lib/pkgconfig:${pkgs.sysprof}/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="${pkgs.lib.makeLibraryPath [pkgs.gtk3 pkgs.glib pkgs.sysprof pkgs.libdatrie]}:$LD_LIBRARY_PATH" export CMAKE_INSTALL_PREFIX="$PWD/build/bundle" - mkdir -p "$PWD/build/bundle" # Setup Android SDK in home directory (standard location) export ANDROID_HOME="$HOME/Android/Sdk" export ANDROID_SDK_ROOT="$ANDROID_HOME" export PATH="$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools/bin:$PATH" - # Use gradle wrapper - export GRADLE_USER_HOME="$PWD/.gradle" - echo "Android SDK: $ANDROID_HOME" - echo "Gradle Home: $GRADLE_USER_HOME" echo "" # Check if Android SDK exists and offer to download if not @@ -72,7 +68,7 @@ mkdir -p cmdline-tools/latest && \ mv cmdline-tools/* cmdline-tools/latest/ 2>/dev/null || echo "Warning: failed to move Android cmdline-tools into 'latest' directory; please check your SDK layout." >&2 && \ rm cmdline-tools.zip && \ cd cmdline-tools/latest/bin && \ -yes | ./sdkmanager --sdk_root=~/Android/Sdk 'platform-tools' 'platforms;android-34' 'build-tools;34.0.0' && \ +yes | ./sdkmanager --sdk_root=~/Android/Sdk 'platform-tools' && \ echo "Android SDK setup complete!" EOF echo ""