Skip to content

Commit 60418a7

Browse files
committed
discord: use new enable option for testbed
1 parent dd29d51 commit 60418a7

File tree

2 files changed

+24
-37
lines changed

2 files changed

+24
-37
lines changed

flake/packages.nix

Lines changed: 16 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -7,46 +7,28 @@
77
{
88

99
perSystem =
10-
{
11-
pkgs,
12-
system,
13-
config,
14-
...
15-
}:
10+
{ pkgs, config, ... }:
1611
{
1712
# Build all packages with 'nix flake check' instead of only verifying they
1813
# are derivations.
1914
checks = config.packages;
2015

21-
packages =
22-
let
23-
testbedPackages = import "${self}/stylix/testbed.nix" {
16+
packages = lib.mkMerge [
17+
# Testbeds are virtual machines based on NixOS, therefore they are
18+
# only available for Linux systems.
19+
(lib.mkIf pkgs.stdenv.hostPlatform.isLinux (
20+
import "${self}/stylix/testbed.nix" {
2421
inherit pkgs inputs lib;
25-
};
26-
27-
# Discord is not available on arm64. This workaround filters out
28-
# testbeds using that package, until we have a better way to handle
29-
# this.
30-
testbedPackages' =
31-
if system == "aarch64-linux" then
32-
lib.filterAttrs (
33-
name: _: !lib.hasPrefix "testbed:discord:vencord" name
34-
) testbedPackages
35-
else
36-
testbedPackages;
37-
in
38-
lib.mkMerge [
39-
# Testbeds are virtual machines based on NixOS, therefore they are
40-
# only available for Linux systems.
41-
(lib.mkIf pkgs.stdenv.hostPlatform.isLinux testbedPackages')
42-
{
43-
docs = pkgs.callPackage "${self}/docs" {
44-
inherit inputs;
45-
inherit (inputs.nixpkgs.lib) nixosSystem;
46-
inherit (inputs.home-manager.lib) homeManagerConfiguration;
47-
};
48-
palette-generator = pkgs.callPackage "${self}/palette-generator" { };
4922
}
50-
];
23+
))
24+
{
25+
docs = pkgs.callPackage "${self}/docs" {
26+
inherit inputs;
27+
inherit (inputs.nixpkgs.lib) nixosSystem;
28+
inherit (inputs.home-manager.lib) homeManagerConfiguration;
29+
};
30+
palette-generator = pkgs.callPackage "${self}/palette-generator" { };
31+
}
32+
];
5133
};
5234
}

modules/discord/testbeds/vencord.nix

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,14 @@ let
66
};
77
in
88
{
9-
stylix.testbed.ui.application = {
10-
name = "discord";
11-
inherit package;
9+
stylix.testbed = {
10+
# Discord is not available on arm64.
11+
enable = lib.meta.availableOn pkgs.stdenv.hostPlatform package;
12+
13+
ui.application = {
14+
name = "discord";
15+
inherit package;
16+
};
1217
};
1318

1419
environment.systemPackages = [ package ];

0 commit comments

Comments
 (0)