summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2018-11-28 14:41:56 +0100
committertv <tv@krebsco.de>2018-11-28 14:41:56 +0100
commit1d7fddc064fef5e77c48602e3524949893a92997 (patch)
tree9b791bed02f715463b925889ddb6720ef131e635
parentd5551ed214479317925239a9801384c9c3aa9add (diff)
tv xmonad: add currentSystem to executable name
This prevents journal messges like: XMonad is recompiling and replacing itself another XMonad process because the current process is called "xmonad" but the compiled configuration should be called "xmonad-x86_64-linux"
-rw-r--r--tv/2configs/xserver/default.nix4
-rw-r--r--tv/5pkgs/simple/xmonad-tv/default.nix2
2 files changed, 3 insertions, 3 deletions
diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index d1345723d..a44ece8b1 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -100,8 +100,8 @@ in {
"\${XMONAD_CONFIG_DIR}"
"\${XMONAD_DATA_DIR}"
]}";
- ExecStart = "${pkgs.xmonad-tv}/bin/xmonad";
- ExecStop = "${pkgs.xmonad-tv}/bin/xmonad --shutdown";
+ ExecStart = "${pkgs.xmonad-tv}/bin/xmonad-${currentSystem}";
+ ExecStop = "${pkgs.xmonad-tv}/bin/xmonad-${currentSystem} --shutdown";
User = cfg.user.name;
WorkingDirectory = cfg.user.home;
};
diff --git a/tv/5pkgs/simple/xmonad-tv/default.nix b/tv/5pkgs/simple/xmonad-tv/default.nix
index a2525e06e..430e6a809 100644
--- a/tv/5pkgs/simple/xmonad-tv/default.nix
+++ b/tv/5pkgs/simple/xmonad-tv/default.nix
@@ -1,6 +1,6 @@
{ pkgs, ... }:
pkgs.writeHaskellPackage "xmonad-tv" {
- executables.xmonad = {
+ executables."xmonad-${builtins.currentSystem}" = {
extra-depends = [
"containers"
"extra"