fix(flake): Fix android path

This commit is contained in:
PapaTutuWawa 2022-11-05 12:53:23 +01:00
parent 12b78742bb
commit 999e6c521a

View File

@ -1,5 +1,5 @@
{ {
description = "Moxxy v2"; description = "moxxmpp";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
@ -30,21 +30,15 @@
useGoogleTVAddOns = false; useGoogleTVAddOns = false;
}; };
pinnedJDK = pkgs.jdk; pinnedJDK = pkgs.jdk;
pythonEnv = pkgs.python3.withPackages (ps: with ps; [
requests pyyaml # For the build scripts
pycryptodome # For the Monal UDP Logger
]);
in { in {
devShell = pkgs.mkShell { devShell = pkgs.mkShell {
buildInputs = with pkgs; [ buildInputs = with pkgs; [
flutter pinnedJDK android.platform-tools dart scrcpy # Flutter/Android flutter pinnedJDK android.platform-tools dart # Flutter/Android
pythonEnv gnumake # Build scripts gitlint # Code hygiene
gitlint jq # Code hygiene
ripgrep # General utilities ripgrep # General utilities
]; ];
ANDROID_HOME = "/home/alexander/Development/Moxxy/moxxyv2/.android/sdk"; ANDROID_HOME = (toString ./.) + "/.android/sdk";
JAVA_HOME = pinnedJDK; JAVA_HOME = pinnedJDK;
ANDROID_AVD_HOME = (toString ./.) + "/.android/avd"; ANDROID_AVD_HOME = (toString ./.) + "/.android/avd";
}; };