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

treewide: Make explicit that 'dev' output of xorgserver is used

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-04-16 20:57:36 +03:00 committed by Vladimír Čunát
parent 51ca347278
commit 1819181726
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@ plasmaPackage rec {
}) })
./0003-tzdir.patch ./0003-tzdir.patch
]; ];
NIX_CFLAGS_COMPILE = [ "-I${xorgserver}/include/xorg" ]; NIX_CFLAGS_COMPILE = [ "-I${xorgserver.dev}/include/xorg" ];
cmakeFlags = [ cmakeFlags = [
"-DEvdev_INCLUDE_DIRS=${xf86inputevdev}/include/xorg" "-DEvdev_INCLUDE_DIRS=${xf86inputevdev}/include/xorg"
"-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include/xorg" "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include/xorg"

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

@ -31,7 +31,7 @@ stdenv.mkDerivation {
buildInputs = [ mtdev xproto xextproto inputproto libpciaccess randrproto ]; buildInputs = [ mtdev xproto xextproto inputproto libpciaccess randrproto ];
buildPhase = '' 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 = '' installPhase = ''