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

* Polkit: remove the wrapper since it's no longer needed (and didn't

Browse Source 
really work as far as I can tell).

svn path=/nixos/trunk/; revision=28734
This commit is contained in:
Eelco Dolstra 2011-08-22 11:46:32 +00:00
parent 13a2563d02
commit d1ae2c2ac1
1 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/security/polkit.nix
View File

@ -6,25 +6,6 @@ let
cfg = config.security.polkit; cfg = config.security.polkit;
pkWrapper = pkgs.stdenv.mkDerivation {
name = "polkit-wrapper";
helper = "libexec/polkit-1/polkit-agent-helper-1";
buildInputs = [ pkgs.xorg.lndir ];
builder = pkgs.writeScript "pkwrap-builder" ''
source $stdenv/setup
mkdir -pv $out
lndir ${pkgs.polkit} $out
# !!! I'm pretty sure the wrapper doesn't work because
# libpolkit-agent-1.so has a hard-coded reference to
# polkit-agent-helper-1.
rm $out/$helper
ln -sv ${config.security.wrapperDir}/polkit-agent-helper-1 $out/$helper
'';
};
in in
{ {
@ -85,7 +66,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = [ pkWrapper ]; environment.systemPackages = [ pkgs.polkit ];
# The polkit daemon reads action files # The polkit daemon reads action files
environment.pathsToLink = [ "/share/polkit-1/actions" ]; environment.pathsToLink = [ "/share/polkit-1/actions" ];
@ -111,7 +92,7 @@ in
} }
]; ];
services.dbus.packages = [ pkWrapper ]; services.dbus.packages = [ pkgs.polkit ];
security.pam.services = [ { name = "polkit-1"; } ]; security.pam.services = [ { name = "polkit-1"; } ];
@ -122,7 +103,7 @@ in
owner = "root"; owner = "root";
group = "root"; group = "root";
setuid = true; setuid = true;
source = pkgs.polkit + "/" + pkWrapper.helper; source = "${pkgs.polkit}/libexec/polkit-1/polkit-agent-helper-1";
}; };
system.activationScripts.polkit = system.activationScripts.polkit =