From c27bc6e9f9b5d075356a3a56c43d3fb52256ec88 Mon Sep 17 00:00:00 2001 From: Konrad Malik Date: Thu, 20 Nov 2025 15:43:32 +0100 Subject: [PATCH] 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 Approved-by: https://github.com/pastadudes Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com> --- stylix/home-manager-integration.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/stylix/home-manager-integration.nix b/stylix/home-manager-integration.nix index 01df3269..a28866cc 100644 --- a/stylix/home-manager-integration.nix +++ b/stylix/home-manager-integration.nix @@ -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 = [