From fc826f8f7a613c68e595e16fd793b0b318425af8 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 4 Jun 2016 19:09:19 +0200
Subject: krebs pkgs.{writeHaskellBin => writeHaskell}

---
 tv/2configs/xserver/default.nix |  4 ++--
 tv/5pkgs/xmonad-tv.nix          | 25 ++++++++++++++-----------
 2 files changed, 16 insertions(+), 13 deletions(-)

(limited to 'tv')

diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 965c3bbe1..c41c0a81e 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -74,8 +74,8 @@ in {
     };
     serviceConfig = {
       SyslogIdentifier = "xmonad";
-      ExecStart = "${pkgs.xmonad-tv}/bin/xmonad-tv";
-      ExecStop = "${pkgs.xmonad-tv}/bin/xmonad-tv --shutdown";
+      ExecStart = "${pkgs.xmonad-tv}/bin/xmonad";
+      ExecStop = "${pkgs.xmonad-tv}/bin/xmonad --shutdown";
       User = user.name;
       WorkingDirectory = user.home;
     };
diff --git a/tv/5pkgs/xmonad-tv.nix b/tv/5pkgs/xmonad-tv.nix
index 74e43dc79..04e7e8359 100644
--- a/tv/5pkgs/xmonad-tv.nix
+++ b/tv/5pkgs/xmonad-tv.nix
@@ -1,14 +1,15 @@
 { pkgs, ... }:
-pkgs.writeHaskellBin "xmonad-tv" {
-  depends = [
-    "containers"
-    "unix"
-    "X11"
-    "xmonad"
-    "xmonad-contrib"
-    "xmonad-stockholm"
-  ];
-} ''
+pkgs.writeHaskell "xmonad-tv" {
+  executables.xmonad = {
+    extra-depends = [
+      "containers"
+      "unix"
+      "X11"
+      "xmonad"
+      "xmonad-contrib"
+      "xmonad-stockholm"
+    ];
+    text = ''
 {-# LANGUAGE DeriveDataTypeable #-} -- for XS
 {-# LANGUAGE FlexibleContexts #-} -- for xmonad'
 {-# LANGUAGE LambdaCase #-}
@@ -299,4 +300,6 @@ wGSConfig = def
 allWorkspaceNames :: W.StackSet i l a sid sd -> X [i]
 allWorkspaceNames ws =
     return $ map W.tag (W.hidden ws) ++ [W.tag $ W.workspace $ W.current ws]
-''
+  '';
+  };
+}
-- 
cgit v1.2.3