From 23598537624218f2d3484f5e4197f35d697e979e Mon Sep 17 00:00:00 2001
From: Katacc <katacc@iostria.org>
Date: Fri, 27 Mar 2026 23:27:03 +0200
Subject: [PATCH] nix files updated to match current project requirements

---
 flake.lock | 12 ++++++------
 flake.nix  | 48 ++++++++++++++++++++++++++++++------------------
 2 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/flake.lock b/flake.lock
index d49dd9069..f19433472 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1730200266,
-        "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
+        "lastModified": 1774386573,
+        "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
+        "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 4ede98c3c..e5a50b6a6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -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
@@ -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;
           };
       }