Merge remote-tracking branch 'prism/master'

5 files changed, 18 insertions, 27 deletions

diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix
index 402fd1ffc..73e41790d 100644
--- a/lass/5pkgs/default.nix
+++ b/lass/5pkgs/default.nix
@@ -13,9 +13,7 @@
     rs = pkgs.callPackage ./rs/default.nix {};
     untilport = pkgs.callPackage ./untilport/default.nix {};
     urban = pkgs.callPackage ./urban/default.nix {};
-    xmonad-lass =
-      let src = pkgs.writeNixFromCabal "xmonad-lass.nix" ./xmonad-lass; in
-      pkgs.haskellPackages.callPackage src {};
+    xmonad-lass = import ./xmonad-lass.nix { inherit pkgs; };
     yt-next = pkgs.callPackage ./yt-next/default.nix {};
   };
 }
diff --git a/lass/5pkgs/xmonad-lass/Main.hs b/lass/5pkgs/xmonad-lass.nix
index d7c66bf4d..841821a7a 100644
--- a/lass/5pkgs/xmonad-lass/Main.hs
+++ b/lass/5pkgs/xmonad-lass.nix
@@ -1,3 +1,15 @@
+{ pkgs, ... }:
+pkgs.writeHaskell "xmonad-lass" {
+  executables.xmonad = {
+    extra-depends = [
+      "containers"
+      "unix"
+      "X11"
+      "xmonad"
+      "xmonad-contrib"
+      "xmonad-stockholm"
+    ];
+    text = ''
 {-# LANGUAGE DeriveDataTypeable #-} -- for XS
 {-# LANGUAGE FlexibleContexts #-} -- for xmonad'
 {-# LANGUAGE LambdaCase #-}
@@ -147,3 +159,8 @@ gridConfig = def
     , gs_navigate = navNSearch
     , gs_font = myFont
     }
+
+    '';
+  };
+}
+
diff --git a/lass/5pkgs/xmonad-lass/.gitignore b/lass/5pkgs/xmonad-lass/.gitignore
deleted file mode 100644
index 616204547..000000000
--- a/lass/5pkgs/xmonad-lass/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/shell.nix
diff --git a/lass/5pkgs/xmonad-lass/Makefile b/lass/5pkgs/xmonad-lass/Makefile
deleted file mode 100644
index cbb0776e6..000000000
--- a/lass/5pkgs/xmonad-lass/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-.PHONY: ghci
-ghci: shell.nix
-	nix-shell --command 'exec ghci -Wall'
-
-shell.nix: xmonad.cabal
-	cabal2nix --shell . > $@
diff --git a/lass/5pkgs/xmonad-lass/xmonad.cabal b/lass/5pkgs/xmonad-lass/xmonad.cabal
deleted file mode 100644
index 37809b599..000000000
--- a/lass/5pkgs/xmonad-lass/xmonad.cabal
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: lass
-Build-Type: Simple
-Cabal-Version: >= 1.2
-License: MIT
-Name: xmonad-lass
-Version: 0
-
-Executable xmonad
-  Build-Depends:
-    base,
-    containers,
-    unix,
-    xmonad,
-    xmonad-contrib,
-    xmonad-stockholm
-  GHC-Options: -Wall -O3 -threaded -rtsopts
-  Main-Is: Main.hs