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

Use polkit-agent-helper-1 from libexec/polkit-1

Browse Source 
svn path=/nixos/trunk/; revision=21844
This commit is contained in:
Yury G. Kudryashov 2010-05-18 16:46:32 +00:00
parent 1133f664bd
commit a0b97de260
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/security/polkit.nix
View File

@ -5,19 +5,17 @@ with pkgs.lib;
let let
pkWrapper = pkgs.stdenv.mkDerivation { pkWrapper = pkgs.stdenv.mkDerivation {
name = "polkit-wrapper"; name = "polkit-wrapper";
helper = "polkit-agent-helper-1"; helper = "libexec/polkit-1/polkit-agent-helper-1";
buildInputs = [ pkgs.xorg.lndir ]; buildInputs = [ pkgs.xorg.lndir ];
builder = pkgs.writeScript "pkwrap-builder" '' builder = pkgs.writeScript "pkwrap-builder" ''
source $stdenv/setup source $stdenv/setup
mkdir -p $out mkdir -pv $out
lndir ${pkgs.polkit} $out lndir ${pkgs.polkit} $out
new=$out/libexec/$helper
mv $new $out/libexec/.$helper.orig rm $out/$helper
echo "exec ${config.security.wrapperDir}/$helper \"\$@\"" > $new ln -sv ${config.security.wrapperDir}/polkit-agent-helper-1 $out/$helper
chmod +x $new
''; '';
}; };
in in
@ -45,19 +43,19 @@ in
setuidOwners = [ setuidOwners = [
{ {
program = pkWrapper.helper; program = "polkit-agent-helper-1";
owner = "root"; owner = "root";
group = "root"; group = "root";
setuid = true; setuid = true;
source = pkWrapper + "/libexec/." + pkWrapper.helper + ".orig"; source = pkgs.polkit + "/" + pkWrapper.helper;
} }
]; ];
}; };
system.activationScripts.policyKit = pkgs.stringsWithDeps.noDepEntry system.activationScripts.polikit = pkgs.stringsWithDeps.noDepEntry
'' ''
mkdir -p /var/lib/polkit-1 mkdir -p /var/lib/polkit-1/localauthority
chmod 700 /var/lib/polkit-1 chmod 700 /var/lib/polkit-1{/localauthority,}
''; '';
}; };