Skip to content

chore: nix files updated to match current project requirements #870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Katacc wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: nix files updated to match current project requirements #870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 30 additions & 18 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,27 +47,37 @@
androidSdk = androidComposition.androidsdk;

libraries = with pkgs; [
olm
libdrm
mesa
olm
libdrm
mesa
webkitgtk_4_1
webkitgtk_4_1.dev
glib
glib.dev
dbus
dbus.dev
keybinder3
];

packages = with pkgs; [
flutter
androidSdk
jdk17
ninja
gtk3
mpv
ffmpeg
mimalloc
libepoxy
dart
libass
pkg-config
android-tools
android-studio
bashInteractive
flutter
androidSdk
jdk17
ninja
gtk3
mpv
ffmpeg
mimalloc
libepoxy
dart
libass
pkg-config
android-tools
android-studio
bashInteractive
cargo
rustup
rustPlatform.bindgenHook
];

in
Expand All @@ -82,6 +92,8 @@
SHELL = "${pkgs.bashInteractive}/bin/bash";
GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/${aapt2buildToolsVersion}/aapt2";
LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath libraries}";

CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER = "${pkgs.gcc}/bin/gcc";
buildInputs = libraries ++ packages;
};
}
Expand Down