fix fallout from merge of master

pkgs/development/tools/build-managers/cmake/default.nix

@@ -1,10 +1,13 @@
 { stdenv, fetchurl
 , bzip2, curl, expat, jsoncpp, libarchive, xz, zlib
 , useNcurses ? false, ncurses, useQt4 ? false, qt4
+, wantPS ? false, ps ? null
 }:
 
 with stdenv.lib;
 
+assert wantPS -> (ps != null);
+
 let
   os = stdenv.lib.optionalString;
   majorVersion = "3.2";
@@ -41,6 +44,8 @@ stdenv.mkDerivation rec {
     ++ optional useNcurses ncurses
     ++ optional useQt4 qt4;
 
+  propagatedBuildInputs = optional wantPS ps;
+
   CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
 
   configureFlags =

pkgs/development/tools/misc/fswatch/default.nix

@@ -3,7 +3,7 @@
 , autoconf
 , automake
 , findutils                     # for xargs
-, gettext_0_19
+, gettext
 , libtool
 , makeWrapper
 , texinfo
@@ -24,7 +24,7 @@ in stdenv.mkDerivation {
     sha256 = "0flq8baqzifhmf61zyiipdipvgy4h0kl551clxrhwa8gvzf75im4";
   };
 
-  buildInputs = [ autoconf automake gettext_0_19 libtool makeWrapper texinfo ];
+  buildInputs = [ autoconf automake gettext libtool makeWrapper texinfo ];
 
   preConfigure = ''
     ./autogen.sh