ethan/fressh
1
0
Fork 0
mirror of https://github.com/EthanShoeDev/fressh.git synced 2026-01-11 14:22:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

flake change

Browse Source
This commit is contained in:
EthanShoeDev
2025-10-07 14:46:28 -04:00
parent 3acde79485
commit a3c2b67513
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
flake.nix
View File

@@ -64,6 +64,7 @@
fen.targets.x86_64-linux-android.stable.rust-std fen.targets.x86_64-linux-android.stable.rust-std
fen.targets.i686-linux-android.stable.rust-std fen.targets.i686-linux-android.stable.rust-std
fen.targets.aarch64-apple-ios.stable.rust-std fen.targets.aarch64-apple-ios.stable.rust-std
fen.targets.aarch64-apple-ios-sim.stable.rust-std
]; ];
defaultPkgs = with pkgs; [ defaultPkgs = with pkgs; [
@@ -94,6 +95,8 @@
clang-tools clang-tools
]; ];
mkShellFn = if pkgs.stdenv.isDarwin then pkgs.mkShellNoCC else pkgs.mkShell;
ndkId = "27-1-12297006"; # nix flake show github:tadfisher/android-nixpkgs | grep ndk ndkId = "27-1-12297006"; # nix flake show github:tadfisher/android-nixpkgs | grep ndk
ndkAttr = "ndk-${ndkId}"; ndkAttr = "ndk-${ndkId}";
ndkVer = builtins.replaceStrings ["-"] ["."] ndkId; ndkVer = builtins.replaceStrings ["-"] ["."] ndkId;
@@ -219,13 +222,13 @@
export PROMPT_COMMAND=". \"$FRESSH_STARSHIP_PREINIT\"" export PROMPT_COMMAND=". \"$FRESSH_STARSHIP_PREINIT\""
''; '';
in { in {
default = pkgs.mkShell { default = mkShellFn {
packages = defaultPkgs ++ [remoteAndroidSdk.androidSdk]; packages = defaultPkgs ++ [remoteAndroidSdk.androidSdk];
shellHook = shellHook =
commonAndroidInit remoteAndroidSdk.sdkRoot; commonAndroidInit remoteAndroidSdk.sdkRoot;
}; };
android-emulator = pkgs.mkShell { android-emulator = mkShellFn {
packages = defaultPkgs ++ [fullAndroidSdk.androidSdk]; packages = defaultPkgs ++ [fullAndroidSdk.androidSdk];
shellHook = shellHook =
commonAndroidInit fullAndroidSdk.sdkRoot; commonAndroidInit fullAndroidSdk.sdkRoot;