Desktop: Fix launcher and taskbar services not starting after wlr-ran…

…dr v0.5.0 - wlr-randr 0.5.0 rejects standalone CLI arguments - force taskbar and launcher services to use bash as an interpreter in `Exec` commands Signed-off-by: Kajus Naujokaitis <[email protected]>
brianmcgillion · Feb 18, 2025 · ac25ff1 · ac25ff1
1 parent 443e3e4
commit ac25ff1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/modules/desktop/graphics/ewwbar.nix b/modules/desktop/graphics/ewwbar.nix
@@ -115,11 +115,13 @@ in
         description = "ewwbar";
         serviceConfig = {
           Type = "forking";
-          ExecCondition = "${pkgs.wlr-randr}/bin/wlr-randr > /dev/null 2>&1";
+          ExecCondition = ''
+            ${pkgs.bash}/bin/bash -c "${pkgs.wlr-randr}/bin/wlr-randr > /dev/null 2>&1"
+          '';
           ExecStart = "${ewwScripts.ewwbar-ctrl}/bin/ewwbar-ctrl start";
           ExecReload = "${ewwScripts.ewwbar-ctrl}/bin/ewwbar-ctrl reload";
           ExecStopPost = ''
-            bash -c "dbus-send --session --dest=org.ghaf.Audio --type=method_call --print-reply /org/ghaf/Audio org.ghaf.Audio.UnsubscribeFromDeviceUpdatedSignal"
+            ${pkgs.bash}/bin/bash -c "${pkgs.dbus}/bin/dbus-send --session --dest=org.ghaf.Audio --type=method_call --print-reply /org/ghaf/Audio org.ghaf.Audio.UnsubscribeFromDeviceUpdatedSignal"
           '';
           Restart = "always";
           RestartSec = "100ms";

diff --git a/modules/desktop/graphics/labwc.config.nix b/modules/desktop/graphics/labwc.config.nix
@@ -501,7 +501,9 @@ in
         serviceConfig = {
           Type = "simple";
           EnvironmentFile = "-/etc/locale.conf";
-          ExecCondition = "${pkgs.wlr-randr}/bin/wlr-randr > /dev/null 2>&1";
+          ExecCondition = ''
+            ${pkgs.bash}/bin/bash -c "${pkgs.wlr-randr}/bin/wlr-randr > /dev/null 2>&1"
+          '';
           ExecStart = "${pkgs.nwg-drawer}/bin/nwg-drawer -r -nofs -nocats -s ${drawerStyle}";
           Restart = "always";
           RestartSec = "1";