I hope I disabled ncursesw in Cygwin. Also fixed device-mapper mention in system.nix. Also added pam in the list of sudo dependencies, it should be done anyway, but still only NOPASSWD entries work.

svn path=/nixpkgs/trunk/; revision=8931

1 files changed, 6 insertions, 1 deletions

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d2a9e466f6f..ec9be0503df 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;
   };