Skip to content

Commit b7c362f

Browse files
committed
usbkvm: remove udev rules hack, use udevrulesdir meson option
1 parent 125dd5b commit b7c362f

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

pkgs/by-name/us/usbkvm/package.nix

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
pkg-config,
1212
python3,
1313
stdenv,
14+
udev,
1415
wrapGAppsHook3,
1516
}:
1617

@@ -51,6 +52,7 @@ stdenv.mkDerivation {
5152
ninja
5253
makeWrapper
5354
wrapGAppsHook3
55+
udev
5456
];
5557

5658
buildInputs = [
@@ -71,6 +73,11 @@ stdenv.mkDerivation {
7173
--replace-fail "@MSLIB_H_PRECOMPILED@" "${ms-tools-lib}/mslib.h"
7274
'';
7375

76+
# Install udev rules in this package's out path:
77+
mesonFlags = [
78+
"-Dudevrulesdir=lib/udev/rules.d"
79+
];
80+
7481
postFixup =
7582
let
7683
GST_PLUGIN_PATH = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [
@@ -83,11 +90,6 @@ stdenv.mkDerivation {
8390
--prefix GST_PLUGIN_PATH : "${GST_PLUGIN_PATH}"
8491
'';
8592

86-
postInstall = ''
87-
mkdir -p $out/lib/udev/rules.d/
88-
cp ../70-usbkvm.rules $out/lib/udev/rules.d/
89-
'';
90-
9193
meta = {
9294
homepage = "https://github.com/carrotIndustries/usbkvm";
9395
description = "An open-source USB KVM (Keyboard, Video and Mouse) adapter";

0 commit comments

Comments
 (0)