forked from Henry-Hiles/nexus
fix up nix flake
This commit is contained in:
parent
c0dfb6370e
commit
e7599f3e94
1 changed files with 17 additions and 31 deletions
18
flake.nix
18
flake.nix
|
|
@ -39,38 +39,24 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
devShells.default =
|
devShells.default = pkgs.mkShell {
|
||||||
let
|
|
||||||
# android = pkgs.callPackage ./nix/android.nix { };
|
|
||||||
in
|
|
||||||
pkgs.mkShell {
|
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
# jdk17
|
|
||||||
go
|
go
|
||||||
olm
|
olm
|
||||||
git
|
git
|
||||||
cargo
|
|
||||||
clang
|
clang
|
||||||
(flutter.override { extraPkgConfigPackages = [ pkgs.libsecret ]; })
|
(flutter.override { extraPkgConfigPackages = [ pkgs.libsecret ]; })
|
||||||
|
|
||||||
# android.platform-tools
|
|
||||||
(pkgs.writeShellScriptBin "rustup" (builtins.readFile ./nix/fake-rustup.sh))
|
(pkgs.writeShellScriptBin "rustup" (builtins.readFile ./nix/fake-rustup.sh))
|
||||||
];
|
];
|
||||||
|
|
||||||
env = rec {
|
env = {
|
||||||
LD_LIBRARY_PATH = "${
|
LD_LIBRARY_PATH = "${
|
||||||
pkgs.lib.makeLibraryPath ([
|
pkgs.lib.makeLibraryPath ([
|
||||||
pkgs.sqlite
|
pkgs.sqlite
|
||||||
])
|
])
|
||||||
}:./build/native_assets/linux";
|
}:./build/native_assets/linux";
|
||||||
CPATH = lib.makeSearchPath "include" [ pkgs.glibc.dev ];
|
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