mirror of
https://github.com/damus-io/notedeck.git
synced 2024-09-18 21:03:31 +00:00
Merge commit 'refs/pull/github/53'
35adae86f9
("nix: keep lazy for use_android=false")
This commit is contained in:
commit
c7a1ca534d
51
shell.nix
51
shell.nix
@ -1,5 +1,5 @@
|
|||||||
{ pkgs ? import <nixpkgs> { }
|
{ pkgs ? import <nixpkgs> { }
|
||||||
, android ? fetchTarball "https://github.com/tadfisher/android-nixpkgs/archive/refs/tags/2024-04-02.tar.gz"
|
, android ? "https://github.com/tadfisher/android-nixpkgs/archive/refs/tags/2024-04-02.tar.gz"
|
||||||
, use_android ? true
|
, use_android ? true
|
||||||
, android_emulator ? false
|
, android_emulator ? false
|
||||||
}:
|
}:
|
||||||
@ -7,25 +7,8 @@ with pkgs;
|
|||||||
|
|
||||||
let
|
let
|
||||||
x11libs = lib.makeLibraryPath [ xorg.libX11 xorg.libXcursor xorg.libXrandr xorg.libXi libglvnd vulkan-loader vulkan-validation-layers libxkbcommon ];
|
x11libs = lib.makeLibraryPath [ xorg.libX11 xorg.libXcursor xorg.libXrandr xorg.libXi libglvnd vulkan-loader vulkan-validation-layers libxkbcommon ];
|
||||||
android-nixpkgs = callPackage android { };
|
|
||||||
ndk-version = "24.0.8215888";
|
|
||||||
|
|
||||||
android-sdk = android-nixpkgs.sdk (sdkPkgs: with sdkPkgs; [
|
|
||||||
cmdline-tools-latest
|
|
||||||
build-tools-34-0-0
|
|
||||||
platform-tools
|
|
||||||
platforms-android-30
|
|
||||||
ndk-24-0-8215888
|
|
||||||
] ++ lib.optional android_emulator [emulator]);
|
|
||||||
|
|
||||||
android-sdk-path = "${android-sdk.out}/share/android-sdk";
|
|
||||||
android-ndk-path = "${android-sdk-path}/ndk/${ndk-version}";
|
|
||||||
|
|
||||||
in
|
in
|
||||||
mkShell ({
|
mkShell ({
|
||||||
buildInputs = [] ++ pkgs.lib.optional use_android [
|
|
||||||
android-sdk
|
|
||||||
];
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
#cargo-udeps
|
#cargo-udeps
|
||||||
#cargo-edit
|
#cargo-edit
|
||||||
@ -40,7 +23,7 @@ mkShell ({
|
|||||||
#wabt
|
#wabt
|
||||||
#gdb
|
#gdb
|
||||||
#heaptrack
|
#heaptrack
|
||||||
] ++ lib.optional use_android [
|
] ++ lib.optionals use_android [
|
||||||
jre
|
jre
|
||||||
openssl
|
openssl
|
||||||
libiconv
|
libiconv
|
||||||
@ -52,7 +35,31 @@ mkShell ({
|
|||||||
darwin.apple_sdk.frameworks.AppKit
|
darwin.apple_sdk.frameworks.AppKit
|
||||||
];
|
];
|
||||||
|
|
||||||
|
} // (
|
||||||
|
lib.optionalAttrs (!stdenv.isDarwin) {
|
||||||
|
LD_LIBRARY_PATH = "${x11libs}";
|
||||||
|
}
|
||||||
|
) // (
|
||||||
|
lib.optionalAttrs use_android (
|
||||||
|
let
|
||||||
|
android-nixpkgs = callPackage (fetchTarball android) { };
|
||||||
|
ndk-version = "24.0.8215888";
|
||||||
|
|
||||||
|
android-sdk = android-nixpkgs.sdk (sdkPkgs: with sdkPkgs; [
|
||||||
|
cmdline-tools-latest
|
||||||
|
build-tools-34-0-0
|
||||||
|
platform-tools
|
||||||
|
platforms-android-30
|
||||||
|
ndk-24-0-8215888
|
||||||
|
] ++ lib.optional android_emulator [ emulator ]);
|
||||||
|
|
||||||
|
android-sdk-path = "${android-sdk.out}/share/android-sdk";
|
||||||
|
android-ndk-path = "${android-sdk-path}/ndk/${ndk-version}";
|
||||||
|
|
||||||
|
in
|
||||||
|
{
|
||||||
|
buildInputs = [ android-sdk ];
|
||||||
ANDROID_NDK_ROOT = android-ndk-path;
|
ANDROID_NDK_ROOT = android-ndk-path;
|
||||||
} // (if !stdenv.isDarwin then {
|
}
|
||||||
LD_LIBRARY_PATH="${x11libs}";
|
)
|
||||||
} else {}))
|
))
|
||||||
|
Loading…
Reference in New Issue
Block a user