dan/biscuit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

put modem-manager-small in overlay

Browse Source
This commit is contained in:
Daniel Barlow 2024-07-22 14:45:47 +01:00
parent 7ad42c43b2
commit f847830a06
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
configuration.nix
View File

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