From 70e7b3447046e8608623816c8c176beb52927f9a Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Sat, 10 Jan 2015 13:26:01 -0600
Subject: [PATCH 1/2] gettext: add derivation for 0.19 series

---
 pkgs/development/libraries/gettext/0.19.nix | 10 ++++++++++
 pkgs/top-level/all-packages.nix             |  1 +
 2 files changed, 11 insertions(+)
 create mode 100644 pkgs/development/libraries/gettext/0.19.nix

diff --git a/pkgs/development/libraries/gettext/0.19.nix b/pkgs/development/libraries/gettext/0.19.nix
new file mode 100644
index 00000000000..27a8bd252c8
--- /dev/null
+++ b/pkgs/development/libraries/gettext/0.19.nix
@@ -0,0 +1,10 @@
+{ stdenv, fetchurl, gettext }:
+
+stdenv.lib.overrideDerivation gettext (attrs: rec {
+  name = "gettext-0.19.4";
+
+  src = fetchurl {
+    url = "mirror://gnu/gettext/${name}.tar.gz";
+    sha256 = "0gvz86m4cs8bdf3mwmwsyx6lrq4ydfxgadrgd9jlx32z3bnz3jca";
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 908d64be5de..df0dea75c52 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5320,6 +5320,7 @@ let
 
   gettext_0_17 = callPackage ../development/libraries/gettext/0.17.nix { };
   gettext_0_18 = callPackage ../development/libraries/gettext { };
+  gettext_0_19 = callPackage ../development/libraries/gettext/0.19.nix { };
 
   gd = callPackage ../development/libraries/gd { };
 

From 41ca36e30c59f334a77a6b149157da8650dd74a8 Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Sat, 10 Jan 2015 13:29:05 -0600
Subject: [PATCH 2/2] fswatch: new derivation

---
 .../tools/misc/fswatch/default.nix            | 47 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/tools/misc/fswatch/default.nix

diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix
new file mode 100644
index 00000000000..bc0ad398362
--- /dev/null
+++ b/pkgs/development/tools/misc/fswatch/default.nix
@@ -0,0 +1,47 @@
+{ stdenv
+, fetchFromGitHub
+, autoconf
+, automake114x
+, findutils                     # for xargs
+, gettext_0_19
+, libtool
+, makeWrapper
+, texinfo
+}:
+
+let
+
+ version = "1.4.5.3";
+
+in stdenv.mkDerivation {
+
+  name = "fswatch-${version}";
+
+  src = fetchFromGitHub {
+    owner = "emcrisostomo";
+    repo = "fswatch";
+    rev = version;
+    sha256 = "05jphslvfgp94vd86myjw5q4wgbayj8avw49h4a4npkwhn93d11j";
+  };
+
+  buildInputs = [ autoconf automake114x gettext_0_19 libtool makeWrapper texinfo ];
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  postFixup = ''
+    for prog in fswatch-run fswatch-run-bash; do
+      wrapProgram $out/bin/$prog \
+        --prefix PATH "${findutils}/bin"
+    done
+  '';
+
+  meta = {
+    description = "A cross-platform file change monitor with multiple backends";
+    homepage = https://github.com/emcrisostomo/fswatch;
+    license = stdenv.lib.licenses.gpl3Plus;
+    platforms = stdenv.lib.platforms.all;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df0dea75c52..ad6d1e8ed5e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4615,6 +4615,8 @@ let
 
   flow = callPackage ../development/tools/analysis/flow { };
 
+  fswatch = callPackage ../development/tools/misc/fswatch { };
+
   pmd = callPackage ../development/tools/analysis/pmd { };
 
   jdepend = callPackage ../development/tools/analysis/jdepend { };