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

brltty: fix systemd-wrapper script

Browse Source 
- Use absolute paths to logger and udev.
- Pass the absolute path to the brltty binary to the wrapper.
- Include generic USB devices in udev rules.
- Remove pulse-access group from systemd unit and sysusers.
This commit is contained in:
Bram 2021-04-03 22:15:33 +02:00 committed by rnhmjoj
parent 6fc8d59b33
commit 13375265e4
No known key found for this signature in database
GPG Key ID: BFBAF4C975F76450
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/tools/misc/brltty/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, python3, bluez { lib, stdenv, fetchurl, pkg-config, python3, bluez
, tcl, acl, kmod, coreutils, shadow , tcl, acl, kmod, coreutils, shadow, util-linux, udev
, alsaSupport ? stdenv.isLinux, alsaLib , alsaSupport ? stdenv.isLinux, alsaLib
, systemdSupport ? stdenv.isLinux, systemd , systemdSupport ? stdenv.isLinux, systemd
}: }:
@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
"SYSTEMD_USERS_DIRECTORY=$(out)/lib/sysusers.d" "SYSTEMD_USERS_DIRECTORY=$(out)/lib/sysusers.d"
"SYSTEMD_FILES_DIRECTORY=$(out)/lib/tmpfiles.d" "SYSTEMD_FILES_DIRECTORY=$(out)/lib/tmpfiles.d"
"UDEV_LIBRARY_DIRECTORY=$(out)/lib/udev" "UDEV_LIBRARY_DIRECTORY=$(out)/lib/udev"
"UDEV_RULES_TYPE=all"
"POLKIT_POLICY_DIR=$(out)/share/polkit-1/actions" "POLKIT_POLICY_DIR=$(out)/share/polkit-1/actions"
"POLKIT_RULE_DIR=$(out)/share/polkit-1/rules.d" "POLKIT_RULE_DIR=$(out)/share/polkit-1/rules.d"
]; ];
@ -70,6 +71,8 @@ stdenv.mkDerivation rec {
substituteInPlace systemd/system/brltty@.service \ substituteInPlace systemd/system/brltty@.service \
--replace '/usr/lib' "$out/lib" \ --replace '/usr/lib' "$out/lib" \
--replace '/sbin/modprobe' '${kmod}/bin/modprobe' --replace '/sbin/modprobe' '${kmod}/bin/modprobe'
# Ensure the systemd-wrapper script uses the correct path to the brltty binary
sed "/^Environment=\"BRLTTY_EXECUTABLE_ARGUMENTS.*/a Environment=\"BRLTTY_EXECUTABLE_PATH=$out/bin/brltty\"" -i systemd/system/brltty@.service
substituteInPlace systemd/system/brltty-device@.service \ substituteInPlace systemd/system/brltty-device@.service \
--replace '/usr/bin/true' '${coreutils}/bin/true' --replace '/usr/bin/true' '${coreutils}/bin/true'
substituteInPlace udev/rules.d/90-brltty-uinput.rules \ substituteInPlace udev/rules.d/90-brltty-uinput.rules \
@ -79,6 +82,14 @@ stdenv.mkDerivation rec {
# Remove unused commands from udev rules # Remove unused commands from udev rules
sed '/initctl/d' -i udev/rules.d/90-brltty-device.rules sed '/initctl/d' -i udev/rules.d/90-brltty-device.rules
) # Remove pulse-access group from systemd unit and sysusers
substituteInPlace systemd/system/brltty@.service \
--replace 'SupplementaryGroups=pulse-access' '# SupplementaryGroups=pulse-access'
substituteInPlace sysusers.d/brltty.conf \
--replace 'm brltty pulse-access' '# m brltty pulse-access'
)
substituteInPlace $out/libexec/brltty/systemd-wrapper \
--replace 'logger' "${util-linux}/bin/logger" \
--replace 'udevadm' "${udev}/bin/udevadm"
''; '';
} }