From 1819181726ef39d30684718f617c1fb1b47d471c Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 16 Apr 2016 20:57:36 +0300 Subject: treewide: Make explicit that 'dev' output of xorgserver is used --- pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix | 2 +- pkgs/os-specific/linux/xf86-input-multitouch/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix index 58c2325f5c49..e3d9176b816d 100644 --- a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix @@ -34,7 +34,7 @@ plasmaPackage rec { }) ./0003-tzdir.patch ]; - NIX_CFLAGS_COMPILE = [ "-I${xorgserver}/include/xorg" ]; + NIX_CFLAGS_COMPILE = [ "-I${xorgserver.dev}/include/xorg" ]; cmakeFlags = [ "-DEvdev_INCLUDE_DIRS=${xf86inputevdev}/include/xorg" "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include/xorg" diff --git a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix index 7abf6d7c8288..38b85a098c17 100644 --- a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix +++ b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { buildInputs = [ mtdev xproto xextproto inputproto libpciaccess randrproto ]; buildPhase = '' - make INCLUDE="$NIX_CFLAGS_COMPILE -I${xorgserver}/include/xorg -I${pixman}/include/pixman-1 -Iinclude" + make INCLUDE="$NIX_CFLAGS_COMPILE -I${xorgserver.dev}/include/xorg -I${pixman}/include/pixman-1 -Iinclude" ''; installPhase = '' -- cgit 1.4.1