diff options
author | Nick Cao <nickcao@nichi.co> | 2023-11-21 09:44:16 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-21 09:44:16 -0500 |
commit | 9075a0d523e2424632bd29620b994a3fdb420ce0 (patch) | |
tree | 97cfea6891195df1ad9135e24fd6798e9010053a /nixos | |
parent | a3a15d720ccc51def8c5835098369bb9a762b1d5 (diff) | |
parent | ed31e0235e97a20ab013c3f1c3fed04041cd146e (diff) |
Merge pull request #268718 from ners/udev
treewide: replace broken udev paths with systemd
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/security/lock-kernel-modules.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/hardware/usbmuxd.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/security/lock-kernel-modules.nix b/nixos/modules/security/lock-kernel-modules.nix index 333b648014263..461b9ffe7ee0b 100644 --- a/nixos/modules/security/lock-kernel-modules.nix +++ b/nixos/modules/security/lock-kernel-modules.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, ... }: with lib; @@ -49,7 +49,7 @@ with lib; }; script = '' - ${pkgs.udev}/bin/udevadm settle + ${config.systemd.package}/bin/udevadm settle echo -n 1 >/proc/sys/kernel/modules_disabled ''; }; diff --git a/nixos/modules/services/hardware/usbmuxd.nix b/nixos/modules/services/hardware/usbmuxd.nix index 9466ea26995b8..d05ad3af8b127 100644 --- a/nixos/modules/services/hardware/usbmuxd.nix +++ b/nixos/modules/services/hardware/usbmuxd.nix @@ -77,7 +77,7 @@ in serviceConfig = { # Trigger the udev rule manually. This doesn't require replugging the # device when first enabling the option to get it to work - ExecStartPre = "${pkgs.udev}/bin/udevadm trigger -s usb -a idVendor=${apple}"; + ExecStartPre = "${config.systemd.package}/bin/udevadm trigger -s usb -a idVendor=${apple}"; ExecStart = "${cfg.package}/bin/usbmuxd -U ${cfg.user} -v"; }; }; |