Make adb module portable

flake.nix

@@ -82,6 +82,10 @@
         };
       };
 
+    moduleInputs = {
+      inherit mkExtraPkgs;
+    };
+
   in {
     # for repl debugging via :lf .
     inherit inputs;
@@ -89,8 +93,8 @@
       inherit lib username;
     };
 
-    nixosModules = import ./modules/nixos;
-    homeManagerModules = import ./modules/home-manager;
+    nixosModules = (import ./modules/nixos) moduleInputs;
+    homeManagerModules = (import ./modules/home-manager) moduleInputs;
 
     nixosConfigurations = {
       slab = lib.nixosSystem rec {

modules/nixos/adb-old.nix

@@ -1,9 +1,10 @@
-{ config, lib, pkgs, extraPkgs, ... }:
-# TODO extraPkgs isn't a normal argument, make this somehow accessible if
-# imported into a different configuration; maybe a wrapper function in the flake
-
+{...}@moduleInputs:
+{ config, lib, pkgs, ... }:
 with lib;
 
+let
+  extraPkgs = (moduleInputs.mkExtraPkgs pkgs.system);
+in
 {
   meta.maintainers = [ maintainers.mic92 ];
 

modules/nixos/default.nix

@@ -1,3 +1,4 @@
+{...}@moduleInputs:
 {
-  adb = import ./adb-old.nix;
+  adb = (import ./adb-old.nix) moduleInputs;
 }