From 8d95889fe67777859b1af1579e0a26a32c28a7df Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 27 Feb 2017 13:16:33 +0100 Subject: xf86_input_multitouch: fix build --- pkgs/os-specific/linux/xf86-input-multitouch/default.nix | 7 ++++++- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix index 80ff992284573..e1bafa93ea6f0 100644 --- a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix +++ b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix @@ -7,6 +7,7 @@ , xextproto , inputproto , randrproto +, xorg , libpciaccess }: @@ -30,7 +31,11 @@ stdenv.mkDerivation { EndSection ''; - buildInputs = [ mtdev xproto xextproto inputproto libpciaccess randrproto ]; + buildInputs = with xorg; [ + mtdev xproto xextproto inputproto libpciaccess randrproto renderproto + xineramaproto resourceproto scrnsaverproto kbproto libxcb videoproto + dri3proto presentproto + ]; buildPhase = '' make INCLUDE="$NIX_CFLAGS_COMPILE -I${xorgserver.dev}/include/xorg -I${pixman}/include/pixman-1 -Iinclude" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61949c9b4d985..c7d9be8a18520 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12065,8 +12065,7 @@ with pkgs; xf86_input_mtrack = callPackage ../os-specific/linux/xf86-input-mtrack { }; - xf86_input_multitouch = - callPackage ../os-specific/linux/xf86-input-multitouch { }; + xf86_input_multitouch = callPackage ../os-specific/linux/xf86-input-multitouch { }; xf86_input_wacom = callPackage ../os-specific/linux/xf86-input-wacom { }; -- cgit 1.4.1