From fe270c011ce246bb7e95a0deec9106f1a04fe8d0 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Mon, 18 Aug 2014 10:08:18 -0300
Subject: [PATCH 1/2] Fluxbox: new package (1.3.5)

---
 .../window-managers/fluxbox/default.nix       | 39 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/applications/window-managers/fluxbox/default.nix

diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix
new file mode 100644
index 00000000000..6c91e773376
--- /dev/null
+++ b/pkgs/applications/window-managers/fluxbox/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, pkgconfig
+, freetype, fribidi
+, libXext, libXft, libXpm, libXrandr, libXrender, xextproto
+, libXinerama
+, imlib2
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "fluxbox-${version}";
+  version = "1.3.5";
+
+  buildInputs = [
+    pkgconfig
+    freetype fribidi
+    libXext libXft libXpm libXrandr libXrender xextproto
+    libXinerama
+    imlib2
+  ];
+
+  src = fetchurl {
+    url = "mirror://sourceforge/fluxbox/${name}.tar.bz2";
+    sha256 = "164dd7bf59791d09a1e729a4fcd5e7347a1004ba675629860a5cf1a271c32983";
+  };
+
+  meta = {
+    description = "Full-featured, light-resource X window manager.";
+    longDescription = ''
+      Fluxbox is a X window manager based on Blackbox 0.61.1 window manager sources.
+      It is very light on resources and easy to handle but yet full of features to make an easy,
+      and extremely fast, desktop experience. It is written in C++ and licensed under MIT license.
+    '';
+    homepage = http://fluxbox.org/;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
+# Many thanks Jack Ryan from Nix-dev mailing list!
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5047bd59f34..6600cb1ae4c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8707,6 +8707,8 @@ let
     debug = config.flashplayer.debug or false;
   };
 
+  fluxbox = callPackage ../applications/window-managers/fluxbox { };
+
   freecad = callPackage ../applications/graphics/freecad {
     opencascade = opencascade_6_5;
     inherit (pythonPackages) matplotlib pycollada;

From 49fcac0d6b064d99ae00692763f6c638129b66d3 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Tue, 19 Aug 2014 10:40:17 -0300
Subject: [PATCH 2/2] Fluxbox: adding system support (as a module)

---
 nixos/modules/module-list.nix                 |  1 +
 .../services/x11/window-managers/fluxbox.nix  | 28 +++++++++++++++++++
 .../window-managers/fluxbox/default.nix       | 10 ++-----
 3 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 nixos/modules/services/x11/window-managers/fluxbox.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 453899175e0..5b1b008a270 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -293,6 +293,7 @@
   ./services/x11/window-managers/awesome.nix
   #./services/x11/window-managers/compiz.nix
   ./services/x11/window-managers/default.nix
+  ./services/x11/window-managers/fluxbox.nix
   ./services/x11/window-managers/icewm.nix
   ./services/x11/window-managers/bspwm.nix
   ./services/x11/window-managers/metacity.nix
diff --git a/nixos/modules/services/x11/window-managers/fluxbox.nix b/nixos/modules/services/x11/window-managers/fluxbox.nix
new file mode 100644
index 00000000000..4748ce99ccf
--- /dev/null
+++ b/nixos/modules/services/x11/window-managers/fluxbox.nix
@@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.xserver.windowManager.fluxbox;
+in
+{
+  ###### interface
+  options = {
+    services.xserver.windowManager.fluxbox.enable = mkOption {
+      default = false;
+      description = "Enable the Fluxbox window manager.";
+    };
+  };
+
+  ###### implementation
+  config = mkIf cfg.enable {
+    services.xserver.windowManager.session = singleton {
+      name = "fluxbox";
+      start = ''
+        ${pkgs.fluxbox}/bin/startfluxbox &
+        waitPID=$!
+      '';
+    };
+    environment.systemPackages = [ pkgs.fluxbox ];
+  };
+}
diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix
index 6c91e773376..af6545b6151 100644
--- a/pkgs/applications/window-managers/fluxbox/default.nix
+++ b/pkgs/applications/window-managers/fluxbox/default.nix
@@ -10,13 +10,7 @@ stdenv.mkDerivation rec {
   name = "fluxbox-${version}";
   version = "1.3.5";
 
-  buildInputs = [
-    pkgconfig
-    freetype fribidi
-    libXext libXft libXpm libXrandr libXrender xextproto
-    libXinerama
-    imlib2
-  ];
+  buildInputs = [ pkgconfig freetype fribidi libXext libXft libXpm libXrandr libXrender xextproto libXinerama imlib2 ];
 
   src = fetchurl {
     url = "mirror://sourceforge/fluxbox/${name}.tar.bz2";
@@ -24,7 +18,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    description = "Full-featured, light-resource X window manager.";
+    description = "Full-featured, light-resource X window manager";
     longDescription = ''
       Fluxbox is a X window manager based on Blackbox 0.61.1 window manager sources.
       It is very light on resources and easy to handle but yet full of features to make an easy,