From 1aabb0a31b25ad83cfaa37c3fe29053417cd9a0f Mon Sep 17 00:00:00 2001 From: Philipp Mildenberger Date: Tue, 21 Nov 2023 08:55:46 +0100 Subject: [PATCH] picom: use getExe instead of hardcoded binary --- modules/services/picom.nix | 4 ++-- .../services/picom/picom-basic-configuration-expected.service | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/services/picom.nix b/modules/services/picom.nix index e1368809..1d9b7bb5 100644 --- a/modules/services/picom.nix +++ b/modules/services/picom.nix @@ -5,7 +5,7 @@ let inherit (lib) boolToString concatMapStringsSep concatStringsSep escape literalExpression mapAttrsToList mkEnableOption mkRenamedOptionModule mkRemovedOptionModule - mkDefault mkIf mkOption optional types warn; + mkDefault mkIf mkOption optional types warn getExe; cfg = config.services.picom; opt = options.services.picom; @@ -318,7 +318,7 @@ in { Service = { ExecStart = concatStringsSep " " ([ - "${cfg.package}/bin/picom" + "${getExe cfg.package}" "--config ${config.xdg.configFile."picom/picom.conf".source}" ] ++ cfg.extraArgs); Restart = "always"; diff --git a/tests/modules/services/picom/picom-basic-configuration-expected.service b/tests/modules/services/picom/picom-basic-configuration-expected.service index 6aeef224..f5d0efeb 100644 --- a/tests/modules/services/picom/picom-basic-configuration-expected.service +++ b/tests/modules/services/picom/picom-basic-configuration-expected.service @@ -2,7 +2,7 @@ WantedBy=graphical-session.target [Service] -ExecStart=@picom@/bin/picom --config /nix/store/00000000000000000000000000000000-hm_picompicom.conf --legacy-backends +ExecStart=@picom@/bin/dummy --config /nix/store/00000000000000000000000000000000-hm_picompicom.conf --legacy-backends Restart=always RestartSec=3