From 3d24aa0dbd614de77336f3244e278983b25956d0 Mon Sep 17 00:00:00 2001
From: Jonathan Glines <auntieNeo@gmail.com>
Date: Mon, 2 Jun 2014 20:41:35 -0600
Subject: [PATCH 1/5] Added typespeed package.

---
 pkgs/games/typespeed/builder.sh  |  2 ++
 pkgs/games/typespeed/default.nix | 12 ++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/games/typespeed/builder.sh
 create mode 100644 pkgs/games/typespeed/default.nix

diff --git a/pkgs/games/typespeed/builder.sh b/pkgs/games/typespeed/builder.sh
new file mode 100644
index 000000000000..273fc55c7552
--- /dev/null
+++ b/pkgs/games/typespeed/builder.sh
@@ -0,0 +1,2 @@
+source $stdenv/setup
+genericBuild
diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix
new file mode 100644
index 000000000000..8acb4de62b46
--- /dev/null
+++ b/pkgs/games/typespeed/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, fetchurl, ncurses }:
+
+stdenv.mkDerivation {
+  name = "typespeed-0.6.5";
+  builder = ./builder.sh;
+  buildInputs = [ ncurses ];
+  configureFlags = "--with-highscoredir=/tmp";
+  src = fetchurl {
+    url = http://typespeed.sourceforge.net/typespeed-0.6.5.tar.gz;
+    sha256 = "5c860385ceed8a60f13217cc0192c4c2b4705c3e80f9866f7d72ff306eb72961";
+  };
+}

From 93ea13874cd2570aa52e443dc03113ee5d57fe77 Mon Sep 17 00:00:00 2001
From: Jonathan Glines <auntieNeo@gmail.com>
Date: Tue, 3 Jun 2014 21:56:34 -0600
Subject: [PATCH 2/5] Working on a package for nitrogen.

---
 pkgs/tools/X11/nitrogen/default.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 pkgs/tools/X11/nitrogen/default.nix

diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix
new file mode 100644
index 000000000000..e9e6587179af
--- /dev/null
+++ b/pkgs/tools/X11/nitrogen/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "nitrogen-1.5.2";
+
+  src = fetchurl {
+    url = "http://projects.l3ib.org/nitrogen/files/nitrogen-1.5.2.tar.gz";
+    sha256 = "60a2437ce6a6c0ba44505fc8066c1973140d4bb48e1e5649f525c7b0b8bf9fd2";
+  };
+
+  meta = {
+    description = "A background browser and setter for X windows";
+    homepage = http://projects.l3ib.org/nitrogen/;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

From 57450acaca1c4a15c2617538b811acbd052c9cf3 Mon Sep 17 00:00:00 2001
From: Jonathan Glines <auntieNeo@gmail.com>
Date: Fri, 13 Jun 2014 10:11:42 -0600
Subject: [PATCH 3/5] Oops, typespeed branch got merged somehow. Removed.

---
 pkgs/games/typespeed/builder.sh  |  2 --
 pkgs/games/typespeed/default.nix | 12 ------------
 2 files changed, 14 deletions(-)
 delete mode 100644 pkgs/games/typespeed/builder.sh
 delete mode 100644 pkgs/games/typespeed/default.nix

diff --git a/pkgs/games/typespeed/builder.sh b/pkgs/games/typespeed/builder.sh
deleted file mode 100644
index 273fc55c7552..000000000000
--- a/pkgs/games/typespeed/builder.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-source $stdenv/setup
-genericBuild
diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix
deleted file mode 100644
index 8acb4de62b46..000000000000
--- a/pkgs/games/typespeed/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, fetchurl, ncurses }:
-
-stdenv.mkDerivation {
-  name = "typespeed-0.6.5";
-  builder = ./builder.sh;
-  buildInputs = [ ncurses ];
-  configureFlags = "--with-highscoredir=/tmp";
-  src = fetchurl {
-    url = http://typespeed.sourceforge.net/typespeed-0.6.5.tar.gz;
-    sha256 = "5c860385ceed8a60f13217cc0192c4c2b4705c3e80f9866f7d72ff306eb72961";
-  };
-}

From c55be95e6e61e9e5111b647c455759776609a34f Mon Sep 17 00:00:00 2001
From: Jonathan Glines <auntieNeo@gmail.com>
Date: Fri, 13 Jun 2014 11:32:29 -0600
Subject: [PATCH 4/5] Nitrogen build working. Missing custom icons in GUI.

---
 pkgs/tools/X11/nitrogen/default.nix | 8 +++++++-
 pkgs/top-level/all-packages.nix     | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix
index e9e6587179af..15e5a5089d0f 100644
--- a/pkgs/tools/X11/nitrogen/default.nix
+++ b/pkgs/tools/X11/nitrogen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig }:
+{ stdenv, fetchurl, pkgconfig, glib, gtk2, gtkmm }:
 
 stdenv.mkDerivation rec {
   name = "nitrogen-1.5.2";
@@ -8,6 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "60a2437ce6a6c0ba44505fc8066c1973140d4bb48e1e5649f525c7b0b8bf9fd2";
   };
 
+  buildInputs = [ glib gtk2 gtkmm pkgconfig ];
+
+  NIX_LDFLAGS = "-lX11";
+
+  patches = [ ./nitrogen-env-bash.patch ];
+
   meta = {
     description = "A background browser and setter for X windows";
     homepage = http://projects.l3ib.org/nitrogen/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ede5259f1ba4..f8f56151282a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1609,6 +1609,8 @@ let
 
   nilfs_utils = callPackage ../tools/filesystems/nilfs-utils {};
 
+  nitrogen = callPackage ../tools/X11/nitrogen {};
+
   nlopt = callPackage ../development/libraries/nlopt {};
 
   npapi_sdk = callPackage ../development/libraries/npapi-sdk {};

From 43432b9fcab4ed3b8ad3ebeef27b8dad81c2580c Mon Sep 17 00:00:00 2001
From: Jonathan Glines <auntieNeo@gmail.com>
Date: Fri, 13 Jun 2014 12:08:44 -0600
Subject: [PATCH 5/5] Added a long description. Added the patch file.

---
 pkgs/tools/X11/nitrogen/default.nix             | 15 ++++++++++++---
 pkgs/tools/X11/nitrogen/nitrogen-env-bash.patch | 10 ++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/tools/X11/nitrogen/nitrogen-env-bash.patch

diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix
index 5648b5715ecf..beecffd4b06f 100644
--- a/pkgs/tools/X11/nitrogen/default.nix
+++ b/pkgs/tools/X11/nitrogen/default.nix
@@ -1,12 +1,15 @@
 { stdenv, fetchurl, pkgconfig, glib, gtk2, gtkmm }:
 
+let version = "1.5.2";
+in
 stdenv.mkDerivation rec {
-  name = "nitrogen-1.5.2";
+  name = "nitrogen-${version}";
 
   src = fetchurl {
-    url = "http://projects.l3ib.org/nitrogen/files/nitrogen-1.5.2.tar.gz";
+    url = "http://projects.l3ib.org/nitrogen/files/nitrogen-${version}.tar.gz";
     sha256 = "60a2437ce6a6c0ba44505fc8066c1973140d4bb48e1e5649f525c7b0b8bf9fd2";
   };
+
   buildInputs = [ glib gtk2 gtkmm pkgconfig ];
 
   NIX_LDFLAGS = "-lX11";
@@ -14,7 +17,13 @@ stdenv.mkDerivation rec {
   patches = [ ./nitrogen-env-bash.patch ];
 
   meta = {
-    description = "A background browser and setter for X windows";
+    description = "A wallpaper browser and setter for X11";
+    longDescription = ''
+      nitrogen is a lightweight utility that can set the root background on X11.
+      It operates independently of any desktop environment, and supports
+      multi-head with Xinerama. Wallpapers are browsable with a convenient GUI,
+      and settings are stored in a human-readable config file.
+    '';
     homepage = http://projects.l3ib.org/nitrogen/;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/X11/nitrogen/nitrogen-env-bash.patch b/pkgs/tools/X11/nitrogen/nitrogen-env-bash.patch
new file mode 100644
index 000000000000..dd8574dcd628
--- /dev/null
+++ b/pkgs/tools/X11/nitrogen/nitrogen-env-bash.patch
@@ -0,0 +1,10 @@
+diff --git a/data/icon-theme-installer b/data/icon-theme-installer
+index 328cf73..ca5d226 100755
+--- a/data/icon-theme-installer
++++ b/data/icon-theme-installer
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ 
+ # icon-theme-installer
+ # Copyright (C) 2006 Novell, Inc.