From 63146593a928d3b77d0e92e82dbc6d959da8cd12 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Tue, 18 Feb 2025 15:54:31 -0500 Subject: [PATCH] tests: don't override scraping of nixpkgs for thunderbird suite Instead, pick just the required packages to pass the tests. Note: we have to refer to real derivations because symlinkJoin assumes the passed derivation is a directory with files, otherwise it fails as: @thunderbird@: No such file or directory Signed-off-by: Ihar Hrachyshka --- .../programs/thunderbird/thunderbird-with-firefox.nix | 6 +++++- tests/modules/programs/thunderbird/thunderbird.nix | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/modules/programs/thunderbird/thunderbird-with-firefox.nix b/tests/modules/programs/thunderbird/thunderbird-with-firefox.nix index bd1744fa8..0d23460d2 100644 --- a/tests/modules/programs/thunderbird/thunderbird-with-firefox.nix +++ b/tests/modules/programs/thunderbird/thunderbird-with-firefox.nix @@ -1,5 +1,9 @@ # Confirm that both Firefox and Thunderbird can be configured at the same time. { lib, realPkgs, ... }: lib.recursiveUpdate (import ./thunderbird.nix { inherit lib realPkgs; }) { - programs.firefox.enable = true; + programs.firefox = { + enable = true; + # Darwin doesn't support wrapped Firefox, using unwrapped instead + package = realPkgs.firefox-unwrapped; + }; } diff --git a/tests/modules/programs/thunderbird/thunderbird.nix b/tests/modules/programs/thunderbird/thunderbird.nix index aa46b3b2d..a5bb3148c 100644 --- a/tests/modules/programs/thunderbird/thunderbird.nix +++ b/tests/modules/programs/thunderbird/thunderbird.nix @@ -1,8 +1,6 @@ { lib, realPkgs, ... }: { imports = [ ../../accounts/email-test-accounts.nix ]; - _module.args.pkgs = lib.mkForce realPkgs; - accounts.email.accounts = { "hm@example.com" = { thunderbird = {