openssh: Let $NIXPKGS_CONFIG determine whether OpenSSH supports PAM or not.

PAM is enabled by default, as before. To disable it, set 

    openssh { pam = false; };

or simply

    pam = false;

in ~/.nixpkgs/config.nix.

svn path=/nixpkgs/trunk/; revision=12312
This commit is contained in:
Peter Simons 2008-07-07 23:11:13 +00:00
parent 4793092374
commit fff2917058

View File

@ -895,7 +895,7 @@ let pkgs = rec {
openssh = import ../tools/networking/openssh {
inherit fetchurl stdenv zlib openssl pam perl;
pamSupport = true;
pamSupport = getPkgConfig "openssh" "pam" true;
};
p7zip = import ../tools/archivers/p7zip {
@ -3395,10 +3395,10 @@ let pkgs = rec {
});
webkit = builderDefsPackage (import ../development/libraries/webkit) {
inherit (gtkLibs) gtk atk pango;
inherit freetype fontconfig gettext gperf curl
libjpeg libtiff libpng libxml2 libxslt sqlite
icu cairo perl intltool automake libtool
inherit (gtkLibs) gtk atk pango;
inherit freetype fontconfig gettext gperf curl
libjpeg libtiff libpng libxml2 libxslt sqlite
icu cairo perl intltool automake libtool
pkgconfig autoconf;
flex = flex2535;
bison = bison23;
@ -7100,11 +7100,11 @@ let pkgs = rec {
disnix = import ../tools/package-management/disnix {
inherit stdenv fetchsvn openssl dbus autoconf automake pkgconfig dbus_glib;
};
DisnixService = import ../tools/package-management/disnix/DisnixService {
inherit stdenv fetchsvn apacheAnt jdk axis2;
};
ntfs3g = import ../misc/ntfs-3g {
inherit fetchurl stdenv fuse pkgconfig utillinux;
};