BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #270737 from bramd/brltty-6.6

Browse source 
Update BRLTTY to 6.6
This commit is contained in:
Michele Guerini Rocco 2024-02-14 14:10:32 +01:00 committed by GitHub
commit bac2597d26
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/services/hardware/brltty.nix
View file

@ -34,6 +34,7 @@ in {
users.users.brltty = {
description = "BRLTTY daemon user";
group = "brltty";
isSystemUser = true;
};
users.groups = {
brltty = { };

18
pkgs/tools/misc/brltty/default.nix
View file

@ -6,14 +6,14 @@
stdenv.mkDerivation rec {
pname = "brltty";
version = "6.3";
version = "6.6";
src = fetchurl {
url = "https://brltty.app/archive/${pname}-${version}.tar.gz";
sha256 = "14psxwlvgyi2fj1zh8rfykyjcjaya8xa7yg574bxd8y8n49n8hvb";
sha256 = "E+j2mb8UTuGx6PkAOt03hQkvf1XvEHxJEuPBT2zMpPw=";
};
nativeBuildInputs = [ pkg-config python3.pkgs.cython tcl ];
nativeBuildInputs = [ pkg-config python3.pkgs.cython python3.pkgs.setuptools tcl ];
buildInputs = [ bluez ]
++ lib.optional alsaSupport alsa-lib
++ lib.optional systemdSupport systemd;
@ -37,10 +37,12 @@ stdenv.mkDerivation rec {
"SYSTEMD_UNITS_DIRECTORY=$(out)/lib/systemd/system"
"SYSTEMD_USERS_DIRECTORY=$(out)/lib/sysusers.d"
"SYSTEMD_FILES_DIRECTORY=$(out)/lib/tmpfiles.d"
"UDEV_LIBRARY_DIRECTORY=$(out)/lib/udev"
"UDEV_PARENT_LOCATION=$(out)/lib"
"INSTALL_COMMANDS_DIRECTORY=$(out)/libexec/brltty"
"UDEV_RULES_TYPE=all"
"POLKIT_POLICY_DIR=$(out)/share/polkit-1/actions"
"POLKIT_RULE_DIR=$(out)/share/polkit-1/rules.d"
"TCL_DIR=$(out)/lib"
];
configureFlags = [
"--with-writable-directory=/run/brltty"
@ -69,7 +71,6 @@ stdenv.mkDerivation rec {
(
cd $out/lib
substituteInPlace systemd/system/brltty@.service \
--replace '/usr/lib' "$out/lib" \
--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
@ -77,11 +78,14 @@ stdenv.mkDerivation rec {
--replace '/usr/bin/true' '${coreutils}/bin/true'
substituteInPlace udev/rules.d/90-brltty-uinput.rules \
--replace '/usr/bin/setfacl' '${acl}/bin/setfacl'
substituteInPlace tmpfiles.d/brltty.conf \
substituteInPlace udev/rules.d/90-brltty-hid.rules \
--replace '/usr/bin/setfacl' '${acl}/bin/setfacl'
substituteInPlace tmpfiles.d/brltty.conf \
--replace "$out/etc" '/etc'
# 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-usb-generic.rules
sed '/initctl/d' -i udev/rules.d/90-brltty-usb-customized.rules
# Remove pulse-access group from systemd unit and sysusers
substituteInPlace systemd/system/brltty@.service \
--replace 'SupplementaryGroups=pulse-access' '# SupplementaryGroups=pulse-access'