From b5722a01530ec7b42ee160ae790fe72e150b353a Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Fri, 16 Feb 2024 00:38:36 +0000 Subject: [PATCH] gl-ar750: ath10k wireless depends on firmware so make sure the firmware is present _first_ the ath10k is still broken anyway, looking into why --- devices/gl-ar750/default.nix | 3 ++- pkgs/kmodloader/default.nix | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/devices/gl-ar750/default.nix b/devices/gl-ar750/default.nix index 7b3eb9d..a0a42e9 100644 --- a/devices/gl-ar750/default.nix +++ b/devices/gl-ar750/default.nix @@ -74,6 +74,7 @@ mac80211 = pkgs.kmodloader.override { targets = ["ath9k" "ath10k_pci"]; inherit (config.system.outputs) kernel; + dependencies = [ ath10k_cal_data ]; }; ath10k_cal_data = let @@ -132,7 +133,7 @@ }; wlan5 = link.build { ifname = "wlan1"; - dependencies = [ mac80211 ath10k_cal_data ]; + dependencies = [ ath10k_cal_data mac80211 ]; }; }; }; diff --git a/pkgs/kmodloader/default.nix b/pkgs/kmodloader/default.nix index 7dbfe4a..a61ce9a 100644 --- a/pkgs/kmodloader/default.nix +++ b/pkgs/kmodloader/default.nix @@ -5,6 +5,7 @@ , kernel ? null , runCommand , pkgsBuildBuild +, dependencies ? [] } : let inherit (liminix.services) oneshot; @@ -38,4 +39,5 @@ in oneshot { name = "kmodloader-" + (concatStringsSep "-" targets); up = "sh ${loader}/load.sh"; down = "sh ${loader}/unload.sh"; + inherit dependencies; }