diff options
| author | Bobby Rong <rjl931189261@126.com> | 2023-07-29 14:00:15 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-29 14:00:15 +0800 |
| commit | a4c0bbf98b10494bcef9b61aebd0683e3558fe42 (patch) | |
| tree | 1f83db03031edd1d87585ed07d43871fcd446c7e | |
| parent | f1468a99463b4e94ff049263e3fda6efd10fe21d (diff) | |
| parent | 6a2999310e4f5d4bfdec15d1aed54f98096fba9d (diff) | |
| download | nixpkgs-a4c0bbf98b10494bcef9b61aebd0683e3558fe42.tar nixpkgs-a4c0bbf98b10494bcef9b61aebd0683e3558fe42.tar.gz nixpkgs-a4c0bbf98b10494bcef9b61aebd0683e3558fe42.tar.bz2 nixpkgs-a4c0bbf98b10494bcef9b61aebd0683e3558fe42.tar.lz nixpkgs-a4c0bbf98b10494bcef9b61aebd0683e3558fe42.tar.xz nixpkgs-a4c0bbf98b10494bcef9b61aebd0683e3558fe42.tar.zst nixpkgs-a4c0bbf98b10494bcef9b61aebd0683e3558fe42.zip | |
Merge pull request #245447 from thoughtfull-systems/fix-xfpm-polkit-on-rebuild
xfce.xfce4-power-manager: use fixed path for helpers
| -rw-r--r-- | pkgs/desktops/xfce/core/xfce4-power-manager/default.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix b/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix index 8755234cbc8..19b55293711 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix @@ -26,6 +26,14 @@ mkXfceDerivation { xfce4-panel ]; + # using /run/current-system/sw/bin instead of nix store path prevents polkit permission errors on + # rebuild. See https://github.com/NixOS/nixpkgs/issues/77485 + postPatch = '' + substituteInPlace src/org.xfce.power.policy.in2 --replace "@sbindir@" "/run/current-system/sw/bin" + substituteInPlace common/xfpm-brightness.c --replace "SBINDIR" "\"/run/current-system/sw/bin\"" + substituteInPlace src/xfpm-suspend.c --replace "SBINDIR" "\"/run/current-system/sw/bin\"" + ''; + meta = with lib; { description = "A power manager for the Xfce Desktop Environment"; maintainers = with maintainers; [ ] ++ teams.xfce.members; |