fix: use android with fixed autopatchelfhook

Author: jtacoma

nix/default.nix

@@ -40,11 +40,22 @@ let
       abiVersions = [ "x86-64" ];
     }).androidsdk;
   };
+  fix-autopatchelfhook = import sources.fix-autopatchelfhook {
+    inherit config;
+    overlays = [
+      android_overlay
+    ];
+  };
+
+  flutter_overlay = _: pkgs: pkgs.lib.optionalAttrs (includeFlutter) {
+    flutter = pkgs.flutterPackages.dev;
+  };
 
   pkgs = import sources.nixpkgs {
     inherit config;
     overlays = [
-      android_overlay
+      (_: pkgs: { inherit (fix-autopatchelfhook) androidsdk; })
+      flutter_overlay
     ];
   };
 
@@ -56,7 +67,7 @@ let
   stdenv = pkgs.stdenv;
 
   flutterTools =
-    lib.optionalAttrs (includeFlutter) { inherit (pkgs) flutter-dev git; };
+    lib.optionalAttrs (includeFlutter) { inherit (pkgs) flutter git; };
 
   flutterAndroidTools = { inherit (pkgs) androidsdk jdk; };
 

nix/sources.json

@@ -47,7 +47,7 @@
         "url": "https://github.com/NixOS/nixpkgs/archive/2ae527c50e049570dd25132f9325527aa2320e32.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
-    "unstable-fix-autopatchelfhook": {
+    "fix-autopatchelfhook": {
          "branch": "fix-autopatchelfhook",
          "description": "Nix Packages collection",
          "homepage": null,