From 65ac9694c723fdc34f0402e02bd26b2edebb200f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 14 Jul 2012 16:26:22 -0400 Subject: [PATCH] xorg: evdev and fbdev need pixman --- pkgs/servers/x11/xorg/overrides.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 0a4d8d307535..4492ea84afae 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -152,7 +152,8 @@ in xf86inputevdev = attrs: attrs // { preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c"; - buildInputs = attrs.buildInputs ++ [xorg.kbproto xorg.libxkbfile xorg.randrproto]; + NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; + buildInputs = attrs.buildInputs ++ [xorg.kbproto xorg.libxkbfile xorg.randrproto xorg.pixman]; installFlags = "sdkdir=\${out}/include/xorg"; }; @@ -172,6 +173,11 @@ in buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa]; }; + xf86videofbdev = attrs: attrs // { + NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; + buildInputs = attrs.buildInputs ++ [xorg.pixman]; + }; + xf86videoopenchrome = attrs: attrs // rec { name = "xf86-video-openchrome-0.2.905"; src = args.fetchurl {