From c0591343ba93f1dfd4f3adf8cedd4b874d2be90d Mon Sep 17 00:00:00 2001 From: kurogeek Date: Mon, 15 Dec 2025 13:22:48 +0700 Subject: [PATCH] mob next [ci-skip] [ci skip] [skip ci] lastFile:overlays/default.nix --- machines/rigel/configuration.nix | 8 +------- modules/clan/phonebox/default.nix | 5 +++++ overlays/default.nix | 5 ----- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/machines/rigel/configuration.nix b/machines/rigel/configuration.nix index b458194..b820028 100644 --- a/machines/rigel/configuration.nix +++ b/machines/rigel/configuration.nix @@ -1,8 +1,4 @@ -{ - config, - self, - ... -}: +{ config, ... }: { imports = [ (import ../../lib/auto-accept-zerotier-members.nix { @@ -14,8 +10,6 @@ }) ]; - nixpkgs.overlays = [ self.overlays.asteriskOverlay ]; - system.stateVersion = "25.11"; clan.core.sops.defaultGroups = [ "admins" ]; clan.core.networking.targetHost = "root@[${config.clan.core.vars.generators.zerotier.files.zerotier-ip.value}]"; diff --git a/modules/clan/phonebox/default.nix b/modules/clan/phonebox/default.nix index 5b8c97a..7ab71a3 100644 --- a/modules/clan/phonebox/default.nix +++ b/modules/clan/phonebox/default.nix @@ -30,6 +30,10 @@ ... }: let + asterisk = pkgs.asterisk.overrideAttrs (old: { + propagatedNativeBuildInputs = [ pkgs.spandsp3 ]; + }); + user = "asterisk"; faxDir = "/run/asterisk/fax"; rtpPortFrom = 10000; @@ -192,6 +196,7 @@ services.asterisk = { enable = lib.mkDefault true; + package = lib.mkDefault asterisk; confFiles = let machines = lib.attrNames roles.default.machines; diff --git a/overlays/default.nix b/overlays/default.nix index 32f554e..583c8e9 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -2,10 +2,5 @@ { flake.overlays = { packagesOverlay = import ../pkgs/overlay.nix; - asteriskOverlay = final: prev: { - asterisk = prev.asterisk.overrideAttrs (old: { - propagatedNativeBuildInputs = [ prev.pkgs.spandsp3 ]; - }); - }; }; }