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

xf86-input-evdev: split dev output

Browse Source
This commit is contained in:
Vladimír Čunát 2016-05-23 13:00:21 +02:00
parent 5908d31cf4
commit 69cc0a7bc5
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/x11/xserver.nix
View File

@ -535,7 +535,7 @@ in
services.xserver.modules = services.xserver.modules =
concatLists (catAttrs "modules" cfg.drivers) ++ concatLists (catAttrs "modules" cfg.drivers) ++
[ xorg.xorgserver.out [ xorg.xorgserver.out
xorg.xf86inputevdev xorg.xf86inputevdev.out
]; ];
services.xserver.xkbDir = mkDefault "${pkgs.xkeyboard_config}/etc/X11/xkb"; services.xserver.xkbDir = mkDefault "${pkgs.xkeyboard_config}/etc/X11/xkb";

2
pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix
View File

@ -36,7 +36,7 @@ plasmaPackage rec {
]; ];
NIX_CFLAGS_COMPILE = [ "-I${xorgserver}/include/xorg" ]; NIX_CFLAGS_COMPILE = [ "-I${xorgserver}/include/xorg" ];
cmakeFlags = [ cmakeFlags = [
"-DEvdev_INCLUDE_DIRS=${xf86inputevdev}/include/xorg" "-DEvdev_INCLUDE_DIRS=${xf86inputevdev.dev}/include/xorg"
"-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include/xorg" "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include/xorg"
]; ];
postInstall = '' postInstall = ''

1
pkgs/servers/x11/xorg/overrides.nix
View File

@ -286,6 +286,7 @@ in
}; };
xf86inputevdev = attrs: attrs // { 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"; preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c";
installFlags = "sdkdir=\${out}/include/xorg"; installFlags = "sdkdir=\${out}/include/xorg";
buildInputs = attrs.buildInputs ++ [ args.mtdev args.libevdev ]; buildInputs = attrs.buildInputs ++ [ args.mtdev args.libevdev ];