Skip to content

Commit

Permalink
tests: don't override scraping of nixpkgs for thunderbird suite
Browse files Browse the repository at this point in the history
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 <ihar.hrachyshka@gmail.com>
  • Loading branch information
booxter authored and khaneliman committed Feb 21, 2025
1 parent 5f5ff39 commit 6314659
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -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;
};
}
2 changes: 0 additions & 2 deletions tests/modules/programs/thunderbird/thunderbird.nix
Original file line number Diff line number Diff line change
@@ -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 = {
Expand Down

0 comments on commit 6314659

Please sign in to comment.