Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions nixos/modules/security/polkit.nix
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ in
];
systemd.services.polkit.stopIfChanged = false;

systemd.sockets."polkit-agent-helper".wantedBy = [ "sockets.target" ];

# The polkit daemon reads action/rule files
environment.pathsToLink = [ "/share/polkit-1" ];

Expand All @@ -94,19 +96,11 @@ in

security.pam.services.polkit-1 = { };

security.wrappers = {
pkexec = {
setuid = true;
owner = "root";
group = "root";
source = "${cfg.package.bin}/bin/pkexec";
};
polkit-agent-helper-1 = {
setuid = true;
owner = "root";
group = "root";
source = "${cfg.package.out}/lib/polkit-1/polkit-agent-helper-1";
};
security.wrappers.pkexec = {
setuid = true;
owner = "root";
group = "root";
source = "${cfg.package.bin}/bin/pkexec";
};

systemd.tmpfiles.rules = [
Expand Down
10 changes: 2 additions & 8 deletions pkgs/by-name/po/polkit/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ let
in
stdenv.mkDerivation rec {
pname = "polkit";
version = "126";
version = "127";

outputs = [
"bin"
Expand All @@ -55,19 +55,13 @@ stdenv.mkDerivation rec {
owner = "polkit-org";
repo = "polkit";
rev = version;
hash = "sha256-ZSqgW//q5DFIsmY17U93mJcK/CHSCHphKTHsTxp40q8=";
hash = "sha256-YTugETy0rqu/bv53jV1UeGqSK79bRXR52EJNcTblvzo=";
};

patches = [
# Allow changing base for paths in pkg-config file as before.
# https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/100
./0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch

(fetchpatch {
name = "elogind.patch";
url = "https://github.com/polkit-org/polkit/commit/55ee1b70456eca8281dda9612c485c619122f202.patch";
hash = "sha256-XOsDyYFBDWxs0PGAgqm3OSUycKR8fYa2ySZqBl8EX7E=";
})
];

depsBuildBuild = [
Expand Down
Loading