diff --git a/nix/pkgs/openwrt/default.nix b/nix/pkgs/openwrt/default.nix index 82918c3..3f684f5 100644 --- a/nix/pkgs/openwrt/default.nix +++ b/nix/pkgs/openwrt/default.nix @@ -63,7 +63,7 @@ in rec { inherit pkgs; release = "19.07.10"; }).identifyProfile model - else if builtins.match "tl-wr.*" model != null + else if builtins.match "tl-wr[78].*" model != null then { release = "18.06.9"; packagesArch = "mips_24kc"; @@ -87,15 +87,26 @@ in rec { "-ppp" "-ppp-mod-pppoe" "-kmod-ppp" "-kmod-pppoe" "-kmod-pppox" "-iptables" "-ip6tables" "-kmod-ipt-offload" "-odhcp6c" "-odhcpd-ipv6only" - # debugging - "tcpdump" # monitoring - "collectd" "collectd-mod-interface" "collectd-mod-load" - "collectd-mod-cpu" "collectd-mod-iwinfo" "collectd-mod-network" - # wpa3 - "-wpad-basic-wolfssl" "-wpad-mini" - "wpad-openssl" - ] ++ nixpkgs.lib.optionals hasVxlan [ + "collectd" + "collectd-mod-iwinfo" "collectd-mod-network" + "collectd-mod-interface" "collectd-mod-load" "collectd-mod-cpu" + ] ++ ( + if args.variant != "tiny" + then [ + # debugging + "tcpdump" + # wpa3 + "-wpad-basic-wolfssl" "-wpad-mini" + "wpad-openssl" + ] else [ + # debugging + "tcpdump-mini" + # wpa3 + "-wpad-openssl" "-wpad-mini" + "wpad-wolfssl" + ] + ) ++ nixpkgs.lib.optionals hasVxlan [ "vxlan" "kmod-vxlan" ] ++ modelPackages.${model} or []; disabledServices = [ "dnsmasq" "uhttpd" ];