public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

Browse Source 
svn path=/nixpkgs/trunk/; revision=8931
This commit is contained in:
Michael Raskin 2007-06-28 22:14:25 +00:00
parent 40657fbece
commit 68d6762e0f
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/ncurses/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl}: {stdenv, fetchurl, unicode ? true}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ncurses-5.6"; name = "ncurses-5.6";
@ -6,8 +6,8 @@ stdenv.mkDerivation {
url = ftp://ftp.nluug.nl/pub/gnu/ncurses/ncurses-5.6.tar.gz; url = ftp://ftp.nluug.nl/pub/gnu/ncurses/ncurses-5.6.tar.gz;
md5 = "b6593abe1089d6aab1551c105c9300e3"; md5 = "b6593abe1089d6aab1551c105c9300e3";
}; };
configureFlags="--with-shared --includedir=\${out}/include --enable-widec --without-debug"; configureFlags="--with-shared --includedir=\${out}/include"+(if unicode then " --enable-widec " else " ") +" --without-debug";
postInstall=" postInstall= if unicode then "
chmod -v 644 $out/lib/libncurses++w.a chmod -v 644 $out/lib/libncurses++w.a
for lib in curses ncurses form panel menu; do for lib in curses ncurses form panel menu; do
rm -vf $out/lib/lib\${lib}.so 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.a $out/lib/lib\${lib}.a
ln -svf lib\${lib}w.so.5 $out/lib/lib\${lib}.so.5 ln -svf lib\${lib}w.so.5 $out/lib/lib\${lib}.so.5
done; done;
"; " else "";
} }

4
pkgs/tools/security/sudo/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, coreutils}: {stdenv, fetchurl, coreutils, pam}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "sudo-1.6.8"; name = "sudo-1.6.8";
@ -13,5 +13,5 @@ stdenv.mkDerivation {
installFlags = " sudoers_uid=nixbld1 sudoers_gid=nixbld sysconfdir=$(prefix)/etc "; installFlags = " sudoers_uid=nixbld1 sudoers_gid=nixbld sysconfdir=$(prefix)/etc ";
buildInputs = [coreutils]; buildInputs = [coreutils pam];
} }

7
pkgs/top-level/all-packages.nix
View File

@ -521,7 +521,7 @@ rec {
}; };
sudo = import ../tools/security/sudo { sudo = import ../tools/security/sudo {
inherit fetchurl stdenv coreutils; inherit fetchurl stdenv coreutils pam;
}; };
sshfsFuse = import ../tools/networking/sshfs-fuse { sshfsFuse = import ../tools/networking/sshfs-fuse {
@ -1624,6 +1624,7 @@ rec {
ncurses = import ../development/libraries/ncurses { ncurses = import ../development/libraries/ncurses {
inherit fetchurl stdenv; inherit fetchurl stdenv;
unicode = (system != "i686-cygwin");
}; };
ncursesDiet = import ../development/libraries/ncurses-diet { ncursesDiet = import ../development/libraries/ncurses-diet {
@ -2476,6 +2477,10 @@ rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
/*gw6c = import ../os-specific/linux/gw6c {
inherit fetchurl stdenv nettools openssl;
};*/
nss_ldap = import ../os-specific/linux/nss_ldap { nss_ldap = import ../os-specific/linux/nss_ldap {
inherit fetchurl stdenv openldap; inherit fetchurl stdenv openldap;
}; };