biscuit

commit f847830a06688caf7ea86f9eea2023cdaa108520
parent 7ad42c43b2d3fb1f9ff14cf2a6d273a2b344184a
Author: Daniel Barlow <dan@telent.net>
Date:   Mon, 22 Jul 2024 14:45:47 +0100

put modem-manager-small in overlay

Diffstat:
M
configuration.nix
 | 
17
++++++++++-------

1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/configuration.nix b/configuration.nix
@@ -12,7 +12,6 @@ let
     makeFlags = ["prefix=${placeholder "out"}"];
   };
 
-  modemmanager_ = pkgs.callPackage ./pkgs/modem-manager {};
   saturn = pkgs.callPackage ./pkgs/saturn {};
 
   drm-framebuffer =  pkgs.stdenv.mkDerivation {
@@ -42,11 +41,15 @@ in {
 
   config = {
     nixpkgs.overlays = [
-      (final: prev: {
-        wlr-randr = prev.wlr-randr.overrideAttrs(o: {
-          depsBuildBuild = [ final.pkgsBuildBuild.pkg-config ];
-        });
-      })
+      (final: prev:
+        let mm = pkgs.callPackage ./pkgs/modem-manager {};
+        in {
+          wlr-randr = prev.wlr-randr.overrideAttrs(o: {
+            depsBuildBuild = [ final.pkgsBuildBuild.pkg-config ];
+          });
+          modemmanager-small = mm;
+          satellite  = prev.satellite.override { modemmanager = mm; };
+        })
     ];
 
     mobile = {
@@ -158,7 +161,7 @@ SUBSYSTEM=="wwan", ENV{DEVNAME}=="/dev/wwan0qmi0", ENV{DEVTYPE}=="wwan_port", \
         let script = pkgs.writeScript "start-modem-manager" ''
           #!${pkgs.bash}/bin/bash
           source ${config.system.build.setEnvironment}
-          ${modemmanager_}/bin/ModemManager
+          ${pkgs.modemmanager-small}/bin/ModemManager
         '';
         in  {
           StandardInput = "journal";