diff --git a/os/programs/swhkd.nix b/os/programs/swhkd.nix index 9096ca0..fab0737 100644 --- a/os/programs/swhkd.nix +++ b/os/programs/swhkd.nix @@ -5,10 +5,8 @@ let lib rustPlatform fetchFromGitHub - makeWrapper pkg-config - systemd - libgcc + udev ; }; in diff --git a/pkgs/swhkd/com.github.swhkd.pkexec.policy b/pkgs/swhkd/com.github.swhkd.pkexec.policy deleted file mode 100644 index f45d96b..0000000 --- a/pkgs/swhkd/com.github.swhkd.pkexec.policy +++ /dev/null @@ -1,13 +0,0 @@ - - - - - Authentication is required to run Simple Wayland Hotkey Daemon - - no - no - yes - - /usr/bin/swhkd - - diff --git a/pkgs/swhkd/swhkd.nix b/pkgs/swhkd/swhkd.nix index 22cad2f..851609c 100644 --- a/pkgs/swhkd/swhkd.nix +++ b/pkgs/swhkd/swhkd.nix @@ -2,10 +2,8 @@ lib, rustPlatform, fetchFromGitHub, - makeWrapper, pkg-config, - systemd, - libgcc, + udev, }: rustPlatform.buildRustPackage { pname = "swhkd"; @@ -22,24 +20,20 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-LBbmFyddyw7vV5voctXq3L4U3Ddbh428j5XbI+td/dg="; nativeBuildInputs = [ - makeWrapper pkg-config ]; - postInstall = '' - cp ${./com.github.swhkd.pkexec.policy} ./com.github.swhkd.pkexec.policy + buildInputs = [ + udev + ]; - install -D -m0444 -t "$out/share/polkit-1/actions" ./com.github.swhkd.pkexec.policy - - substituteInPlace "$out/share/polkit-1/actions/com.github.swhkd.pkexec.policy" \ - --replace /usr/bin/swhkd \ - "$out/bin/swhkd" + postBuild = '' + $src/scripts/build-polkit-policy.sh --swhkd-path=$out/bin/swhkd ''; - buildInputs = [ - systemd - libgcc - ]; + postInstall = '' + install -D -m0444 ./com.github.swhkd.pkexec.policy -t $out/share/polkit-1/actions + ''; meta = with lib; { description = "A drop-in replacement for sxhkd that works with wayland";