b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

* For consistency with Nixpkgs.

Browse source 
svn path=/nixos/trunk/; revision=17427
This commit is contained in:
Eelco Dolstra 2009-09-25 20:12:35 +00:00
parent 38898d5304
commit 3e5912833d
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/module-list.nix
View file

@ -26,9 +26,9 @@
./programs/pwdutils/pwdutils.nix
./programs/ssh.nix
./programs/ssmtp.nix
./security/console-kit.nix
./security/consolekit.nix
./security/pam.nix
./security/policy-kit.nix
./security/polkit.nix
./security/setuid-wrappers.nix
./security/sudo.nix
./services/audio/alsa.nix

8
modules/security/console-kit.nix → modules/security/consolekit.nix
View file

@ -6,15 +6,15 @@ with pkgs.lib;
config = {
environment.systemPackages = [ pkgs.console_kit ];
environment.systemPackages = [ pkgs.consolekit ];
services.dbus.packages = [ pkgs.console_kit ];
services.dbus.packages = [ pkgs.consolekit ];
environment.etc = singleton
{ source = (pkgs.buildEnv {
name = "console-kit-config";
name = "consolekit-config";
pathsToLink = [ "/etc/ConsoleKit" ];
paths = [ pkgs.console_kit pkgs.udev ];
paths = [ pkgs.consolekit pkgs.udev ];
}) + "/etc/ConsoleKit";
target = "ConsoleKit";
};

2
modules/security/pam.nix
View file

@ -64,7 +64,7 @@ let
"session optional ${pam_ldap}/lib/security/pam_ldap.so"}
session required ${pam_unix2}/lib/security/pam_unix2.so
${optionalString ownDevices
"session optional ${pkgs.console_kit}/lib/security/pam_ck_connector.so"}
"session optional ${pkgs.consolekit}/lib/security/pam_ck_connector.so"}
${optionalString forwardXAuth
"session optional pam_xauth.so xauthpath=${pkgs.xorg.xauth}/bin/xauth systemuser=99"}
'';

4
modules/security/policy-kit.nix → modules/security/polkit.nix
View file

@ -6,9 +6,9 @@ with pkgs.lib;
config = {
environment.systemPackages = [ pkgs.policy_kit ];
environment.systemPackages = [ pkgs.polkit ];
services.dbus.packages = [ pkgs.policy_kit ];
services.dbus.packages = [ pkgs.polkit ];
security.pam.services = [ { name = "polkit-1"; } ];

2
modules/services/x11/display-managers/default.nix
View file

@ -46,7 +46,7 @@ let
# Start a ConsoleKit session so that we get ownership of various
# devices.
if test -z "$XDG_SESSION_COOKIE"; then
exec ${pkgs.console_kit}/bin/ck-launch-session "$0" "$sessionType"
exec ${pkgs.consolekit}/bin/ck-launch-session "$0" "$sessionType"
fi
# Load X defaults.