From c6f28f988c930329db62cd3054c206d515b2ecb3 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sat, 13 Sep 2014 15:21:56 -0300
Subject: [PATCH] Windowmaker: adding system service file, and a long
 description

Closes #4066
---
 .../x11/window-managers/windowmaker.nix       | 28 +++++++++++++++++++
 .../window-managers/windowmaker/default.nix   | 19 +++++++++----
 2 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 nixos/modules/services/x11/window-managers/windowmaker.nix

diff --git a/nixos/modules/services/x11/window-managers/windowmaker.nix b/nixos/modules/services/x11/window-managers/windowmaker.nix
new file mode 100644
index 000000000000..27cedb7da0ca
--- /dev/null
+++ b/nixos/modules/services/x11/window-managers/windowmaker.nix
@@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.xserver.windowManager.windowmaker;
+in
+{
+  ###### interface
+  options = {
+    services.xserver.windowManager.windowmaker.enable = mkOption {
+      default = false;
+      description = "Enable the Windowmaker window manager.";
+    };
+  };
+
+  ###### implementation
+  config = mkIf cfg.enable {
+    services.xserver.windowManager.session = singleton {
+      name = "windowmaker";
+      start = ''
+        ${pkgs.windowmaker}/bin/wmaker &
+        waitPID=$!
+      '';
+    };
+    environment.systemPackages = [ pkgs.windowmaker ];
+  };
+}
diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix
index bbb6c0388251..190319db7208 100644
--- a/pkgs/applications/window-managers/windowmaker/default.nix
+++ b/pkgs/applications/window-managers/windowmaker/default.nix
@@ -3,18 +3,27 @@
 stdenv.mkDerivation rec {
   name = "windowmaker-${version}";
   version = "0.95.5";
+  srcName = "WindowMaker-${version}";
 
   src = fetchurl {
-    url = "http://windowmaker.org/pub/source/release/"
-        + "WindowMaker-${version}.tar.gz";
+    url = "http://windowmaker.org/pub/source/release/${srcName}.tar.gz";
     sha256 = "1l3hmx4jzf6vp0zclqx9gsqrlwh4rvqm1g1zr5ha0cp0zmsg89ab";
   };
 
   buildInputs = [ pkgconfig libX11 libXft libXmu ];
 
-  meta = {
-    homepage = "http://windowmaker.org/";
+  meta = with stdenv.lib; {
+    homepage = http://windowmaker.org/;
     description = "NeXTSTEP-like window manager";
-    license = stdenv.lib.licenses.gpl2Plus;
+    longDescription = ''
+      Window Maker is an X11 window manager originally designed to
+      provide integration support for the GNUstep Desktop
+      Environment. In every way possible, it reproduces the elegant look
+      and feel of the NEXTSTEP user interface. It is fast, feature rich,
+      easy to configure, and easy to use. It is also free software, with
+      contributions being made by programmers from around the world.
+    '';
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.AndersonTorres ];
   };
 }