stylix/home-manager-integration: fix evaluation on darwin (#1973)
Closes: https://github.com/nix-community/stylix/issues/1981 Link: https://github.com/nix-community/stylix/pull/1973 Reviewed-by: 0xda157 <da157@voidq.com> Approved-by: https://github.com/pastadudes Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com>
This commit is contained in:
parent
e60876ba7c
commit
c27bc6e9f9
1 changed files with 4 additions and 5 deletions
|
|
@ -2,7 +2,6 @@
|
|||
lib,
|
||||
config,
|
||||
options,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
|
@ -14,8 +13,10 @@ let
|
|||
condition ? lib.const true,
|
||||
}:
|
||||
{ config, osConfig, ... }:
|
||||
lib.mkIf (condition config) (
|
||||
lib.setAttrByPath path (lib.mkDefault (lib.getAttrFromPath path osConfig))
|
||||
lib.optionalAttrs (lib.hasAttrByPath path osConfig) (
|
||||
lib.mkIf (condition config) (
|
||||
lib.setAttrByPath path (lib.mkDefault (lib.getAttrFromPath path osConfig))
|
||||
)
|
||||
)
|
||||
)
|
||||
[
|
||||
|
|
@ -38,7 +39,6 @@ let
|
|||
"stylix"
|
||||
"cursor"
|
||||
];
|
||||
condition = _homeConfig: !pkgs.stdenv.hostPlatform.isDarwin;
|
||||
}
|
||||
{
|
||||
path = [
|
||||
|
|
@ -111,7 +111,6 @@ let
|
|||
"stylix"
|
||||
"icons"
|
||||
];
|
||||
condition = _homeConfig: !pkgs.stdenv.hostPlatform.isDarwin;
|
||||
}
|
||||
{
|
||||
path = [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue