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

xf86_input_multitouch: fix build

Browse Source
This commit is contained in:
Robin Gloster 2017-02-27 13:16:33 +01:00
parent e4c70c56af
commit 8d95889fe6
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/os-specific/linux/xf86-input-multitouch/default.nix
View File

@ -7,6 +7,7 @@
, xextproto , xextproto
, inputproto , inputproto
, randrproto , randrproto
, xorg
, libpciaccess , libpciaccess
}: }:
@ -30,7 +31,11 @@ stdenv.mkDerivation {
EndSection 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 = '' buildPhase = ''
make INCLUDE="$NIX_CFLAGS_COMPILE -I${xorgserver.dev}/include/xorg -I${pixman}/include/pixman-1 -Iinclude" make INCLUDE="$NIX_CFLAGS_COMPILE -I${xorgserver.dev}/include/xorg -I${pixman}/include/pixman-1 -Iinclude"

3
pkgs/top-level/all-packages.nix
View File

@ -12065,8 +12065,7 @@ with pkgs;
xf86_input_mtrack = callPackage ../os-specific/linux/xf86-input-mtrack { }; xf86_input_mtrack = callPackage ../os-specific/linux/xf86-input-mtrack { };
xf86_input_multitouch = xf86_input_multitouch = callPackage ../os-specific/linux/xf86-input-multitouch { };
callPackage ../os-specific/linux/xf86-input-multitouch { };
xf86_input_wacom = callPackage ../os-specific/linux/xf86-input-wacom { }; xf86_input_wacom = callPackage ../os-specific/linux/xf86-input-wacom { };