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, 4 insertions, 4 deletions

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 "";
 }