makefu/stockholm
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

xmonad-tv: convert to writeHaskellBin

Browse source
This commit is contained in:
tv 2016-05-25 00:31:49 +02:00
parent 2b71d7f728
commit 37ee40759f
6 changed files with 15 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tv/2configs/xserver/default.nix
View file

@ -116,12 +116,12 @@ let
settle ${pkgs.xorg.xhost}/bin/xhost +LOCAL: settle ${pkgs.xorg.xhost}/bin/xhost +LOCAL:
settle ${pkgs.xorg.xrdb}/bin/xrdb -merge ${import ./Xresources.nix args} settle ${pkgs.xorg.xrdb}/bin/xrdb -merge ${import ./Xresources.nix args}
settle ${pkgs.xorg.xsetroot}/bin/xsetroot -solid '#1c1c1c' settle ${pkgs.xorg.xsetroot}/bin/xsetroot -solid '#1c1c1c'
exec ${pkgs.xmonad-tv}/bin/xmonad exec ${pkgs.xmonad-tv}/bin/xmonad-tv
''; '';
xmonad-stop = pkgs.writeScriptBin "xmonad-stop" '' xmonad-stop = pkgs.writeScriptBin "xmonad-stop" ''
#! /bin/sh #! /bin/sh
exec ${pkgs.xmonad-tv}/bin/xmonad --shutdown exec ${pkgs.xmonad-tv}/bin/xmonad-tv --shutdown
''; '';
xserver-environment = { xserver-environment = {

4
tv/5pkgs/default.nix
View file

@ -18,8 +18,6 @@
}; };
ff = pkgs.callPackage ./ff {}; ff = pkgs.callPackage ./ff {};
viljetic-pages = pkgs.callPackage ./viljetic-pages {}; viljetic-pages = pkgs.callPackage ./viljetic-pages {};
xmonad-tv = xmonad-tv = import ./xmonad-tv.nix { inherit pkgs; };
let src = pkgs.writeNixFromCabal "xmonad-tv.nix" ./xmonad-tv; in
pkgs.haskellPackages.callPackage src {};
}; };
} }

12
tv/5pkgs/xmonad-tv/Main.hs → tv/5pkgs/xmonad-tv.nix
View file

@ -1,3 +1,14 @@
{ pkgs, ... }:
pkgs.writeHaskellBin "xmonad-tv" {
depends = [
"containers"
"unix"
"X11"
"xmonad"
"xmonad-contrib"
"xmonad-stockholm"
];
} ''
{-# LANGUAGE DeriveDataTypeable #-} -- for XS {-# LANGUAGE DeriveDataTypeable #-} -- for XS
{-# LANGUAGE FlexibleContexts #-} -- for xmonad' {-# LANGUAGE FlexibleContexts #-} -- for xmonad'
{-# LANGUAGE LambdaCase #-} {-# LANGUAGE LambdaCase #-}
@ -278,3 +289,4 @@ wGSConfig = def
allWorkspaceNames :: W.StackSet i l a sid sd -> X [i] allWorkspaceNames :: W.StackSet i l a sid sd -> X [i]
allWorkspaceNames ws = allWorkspaceNames ws =
return $ map W.tag (W.hidden ws) ++ [W.tag $ W.workspace $ W.current ws] return $ map W.tag (W.hidden ws) ++ [W.tag $ W.workspace $ W.current ws]
''

1
tv/5pkgs/xmonad-tv/.gitignore vendored
View file

@ -1 +0,0 @@
/shell.nix

6
tv/5pkgs/xmonad-tv/Makefile
View file

@ -1,6 +0,0 @@
.PHONY: ghci
ghci: shell.nix
nix-shell --command 'exec ghci -Wall'
shell.nix: xmonad.cabal
cabal2nix --shell . > $@

18
tv/5pkgs/xmonad-tv/xmonad.cabal
View file

@ -1,18 +0,0 @@
Author: tv
Build-Type: Simple
Cabal-Version: >= 1.2
License: MIT
Name: xmonad-tv
Version: 0
Executable xmonad
Build-Depends:
base,
containers,
unix,
X11,
xmonad,
xmonad-contrib,
xmonad-stockholm
GHC-Options: -Wall -O3 -threaded -rtsopts
Main-Is: Main.hs