diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 31219e0ad0eb..1938483b4bc4 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, unicode ? true}:
 
 stdenv.mkDerivation {
   name = "ncurses-5.6";
@@ -6,8 +6,8 @@ stdenv.mkDerivation {
     url = ftp://ftp.nluug.nl/pub/gnu/ncurses/ncurses-5.6.tar.gz;
     md5 = "b6593abe1089d6aab1551c105c9300e3";
   };
-  configureFlags="--with-shared --includedir=\${out}/include --enable-widec --without-debug";
-  postInstall="
+  configureFlags="--with-shared --includedir=\${out}/include"+(if unicode then  " --enable-widec " else " ") +" --without-debug";
+  postInstall= if unicode then "
     chmod -v 644 $out/lib/libncurses++w.a
     for lib in curses ncurses form panel menu; do
       rm -vf $out/lib/lib\${lib}.so
@@ -15,5 +15,5 @@ stdenv.mkDerivation {
       ln -svf lib\${lib}w.a $out/lib/lib\${lib}.a
       ln -svf lib\${lib}w.so.5 $out/lib/lib\${lib}.so.5
     done;
-  ";
+  " else "";
 }
diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index e9fa3e9423c0..f2d5a6612142 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, coreutils}:
+{stdenv, fetchurl, coreutils, pam}:
 stdenv.mkDerivation {
   name = "sudo-1.6.8";
 
@@ -13,5 +13,5 @@ stdenv.mkDerivation {
 
   installFlags = " sudoers_uid=nixbld1 sudoers_gid=nixbld sysconfdir=$(prefix)/etc ";
 
-  buildInputs = [coreutils];
+  buildInputs = [coreutils pam];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d2a9e466f6fe..ec9be0503df9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -521,7 +521,7 @@ rec {
   };
 
   sudo = import ../tools/security/sudo {
-    inherit fetchurl stdenv coreutils;
+    inherit fetchurl stdenv coreutils pam;
   };
 
   sshfsFuse = import ../tools/networking/sshfs-fuse {
@@ -1624,6 +1624,7 @@ rec {
 
   ncurses = import ../development/libraries/ncurses {
     inherit fetchurl stdenv;
+    unicode = (system != "i686-cygwin");
   };
 
   ncursesDiet = import ../development/libraries/ncurses-diet {
@@ -2476,6 +2477,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  /*gw6c = import ../os-specific/linux/gw6c {
+    inherit fetchurl stdenv nettools openssl;
+  };*/
+
   nss_ldap = import ../os-specific/linux/nss_ldap {
     inherit fetchurl stdenv openldap;
   };