fix up nix flake
This commit is contained in:
parent
8be9a4f2f6
commit
96ca282d5a
1 changed files with 17 additions and 31 deletions
18
flake.nix
18
flake.nix
|
|
@ -39,38 +39,24 @@
|
|||
};
|
||||
};
|
||||
|
||||
devShells.default =
|
||||
let
|
||||
# android = pkgs.callPackage ./nix/android.nix { };
|
||||
in
|
||||
pkgs.mkShell {
|
||||
devShells.default = pkgs.mkShell {
|
||||
packages = with pkgs; [
|
||||
# jdk17
|
||||
go
|
||||
olm
|
||||
git
|
||||
cargo
|
||||
clang
|
||||
(flutter.override { extraPkgConfigPackages = [ pkgs.libsecret ]; })
|
||||
|
||||
# android.platform-tools
|
||||
(pkgs.writeShellScriptBin "rustup" (builtins.readFile ./nix/fake-rustup.sh))
|
||||
];
|
||||
|
||||
env = rec {
|
||||
env = {
|
||||
LD_LIBRARY_PATH = "${
|
||||
pkgs.lib.makeLibraryPath ([
|
||||
pkgs.sqlite
|
||||
])
|
||||
}:./build/native_assets/linux";
|
||||
CPATH = lib.makeSearchPath "include" [ pkgs.glibc.dev ];
|
||||
|
||||
# ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk";
|
||||
# ANDROID_SDK_ROOT = ANDROID_HOME;
|
||||
# JAVA_HOME = pkgs.jdk17;
|
||||
|
||||
# TOOLS = "${ANDROID_HOME}/build-tools/${"36.0.0"}";
|
||||
# GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${TOOLS}/aapt2";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue