simplify flake

devshell.nix

@@ -1,50 +0,0 @@
-{ pkgs, lib }:
-let
-  android = pkgs.androidenv.composeAndroidPackages {
-    toolsVersion = "26.1.1";
-    platformToolsVersion = "37.0.1";
-    buildToolsVersions = [
-      "35.0.0"
-      "36.0.0"
-    ];
-    cmakeVersions = [ "3.22.1" ];
-    platformVersions = [ "36" ];
-    abiVersions = [
-      "armeabi-v7a"
-      "arm64-v8a"
-    ];
-    includeNDK = true;
-    ndkVersions = [ "28.2.13676358" ];
-  };
-in
-pkgs.mkShell {
-  packages =
-    with pkgs;
-    [
-      go
-      git
-
-      libGL
-      (flutter.override {
-        extraPkgConfigPackages = [
-          mpv-unwrapped
-          libass
-        ];
-      })
-      android.platform-tools
-    ]
-    ++ lib.optional pkgs.stdenv.isLinux wayland;
-
-  env = rec {
-    LIBCLANG_PATH = lib.makeLibraryPath [ pkgs.libclang ];
-
-    ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk";
-    ANDROID_SDK_ROOT = ANDROID_HOME;
-    JAVA_HOME = pkgs.jdk21;
-
-    GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_HOME}/build-tools/36.0.0/aapt2";
-  }
-  // lib.optionalAttrs pkgs.stdenv.isLinux {
-    LD_LIBRARY_PATH = "./build/native_assets/linux:${lib.makeLibraryPath [ pkgs.zlib ]}";
-  };
-}

flake.lock

@@ -5,11 +5,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1785627969,
+        "lastModified": 1788450739,
-        "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=",
+        "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a",
+        "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993",
         "type": "github"
       },
       "original": {
@@ -42,11 +42,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1774860670,
+        "lastModified": 1791751882,
-        "narHash": "sha256-YjJkQrvxrErXtfDi3obUn6rNmkA+CIAZ3f5NgL5xuYE=",
+        "narHash": "sha256-DWcMlQFQMEqQGAHU6rAbl4uKWmlJMR1HZG0BvH0H2fk=",
         "owner": "neobrain",
         "repo": "nix2flatpak",
-        "rev": "61d68e21e3fbc2d57590051f48736bea271f4aba",
+        "rev": "7731e8b3fca73879f8217de5a919c0a5d17303de",
         "type": "github"
       },
       "original": {
@@ -73,11 +73,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1785031560,
+        "lastModified": 1788057806,
-        "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=",
+        "narHash": "sha256-DTQSMxzDWmT0zhguthvegnVkn7CFqGCv4IHCzk5ZUpM=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c",
+        "rev": "596e2e3940e09b2abbeb03f75fa1828c57fcd72c",
         "type": "github"
       },
       "original": {
@@ -88,11 +88,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1786862985,
+        "lastModified": 1790689126,
-        "narHash": "sha256-FBJRXmbGXiSUDvYEbfLYRkckayyZ6SK1UEqhCrIZ2Cs=",
+        "narHash": "sha256-ilerN1WLSvF+HMjziC/Wv99J5y02maDH+6hZPwsORKg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e5bdc4a41d4c072fe1e3787eaa0320a384741d44",
+        "rev": "b4fd65b198c599cbe814fcb9f42d25d021595ec9",
         "type": "github"
       },
       "original": {

flake.nix

@@ -40,7 +40,11 @@
             };
           };
 
-          devShells.default = pkgs.callPackage ./devshell.nix { };
+          devShells.default = pkgs.mkShell {
+            packages = with pkgs; [
+              flutter
+            ];
+          };
         };
     };
 }