mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 07:23:20 +00:00
xf86-input-evdev: split dev output
This commit is contained in:
parent
5908d31cf4
commit
69cc0a7bc5
@ -535,7 +535,7 @@ in
|
||||
services.xserver.modules =
|
||||
concatLists (catAttrs "modules" cfg.drivers) ++
|
||||
[ xorg.xorgserver.out
|
||||
xorg.xf86inputevdev
|
||||
xorg.xf86inputevdev.out
|
||||
];
|
||||
|
||||
services.xserver.xkbDir = mkDefault "${pkgs.xkeyboard_config}/etc/X11/xkb";
|
||||
|
@ -36,7 +36,7 @@ plasmaPackage rec {
|
||||
];
|
||||
NIX_CFLAGS_COMPILE = [ "-I${xorgserver}/include/xorg" ];
|
||||
cmakeFlags = [
|
||||
"-DEvdev_INCLUDE_DIRS=${xf86inputevdev}/include/xorg"
|
||||
"-DEvdev_INCLUDE_DIRS=${xf86inputevdev.dev}/include/xorg"
|
||||
"-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include/xorg"
|
||||
];
|
||||
postInstall = ''
|
||||
|
@ -286,6 +286,7 @@ in
|
||||
};
|
||||
|
||||
xf86inputevdev = attrs: attrs // {
|
||||
outputs = [ "dev" "out" ]; # to get rid of xorgserver.dev; man is tiny
|
||||
preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c";
|
||||
installFlags = "sdkdir=\${out}/include/xorg";
|
||||
buildInputs = attrs.buildInputs ++ [ args.mtdev args.libevdev ];
|
||||
|
Loading…
Reference in New Issue
Block a user