diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-16 20:57:36 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-19 10:04:41 +0200 |
| commit | 1819181726ef39d30684718f617c1fb1b47d471c (patch) | |
| tree | 6f9f4027238555e430d88caa79b3156bdbaa6b88 | |
| parent | 51ca347278dc7e1210cc4b122c7e79fa68d79ad5 (diff) | |
| download | nixpkgs-1819181726ef39d30684718f617c1fb1b47d471c.tar nixpkgs-1819181726ef39d30684718f617c1fb1b47d471c.tar.gz nixpkgs-1819181726ef39d30684718f617c1fb1b47d471c.tar.bz2 nixpkgs-1819181726ef39d30684718f617c1fb1b47d471c.tar.lz nixpkgs-1819181726ef39d30684718f617c1fb1b47d471c.tar.xz nixpkgs-1819181726ef39d30684718f617c1fb1b47d471c.tar.zst nixpkgs-1819181726ef39d30684718f617c1fb1b47d471c.zip | |
treewide: Make explicit that 'dev' output of xorgserver is used
| -rw-r--r-- | pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix | 2 | ||||
| -rw-r--r-- | 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 58c2325f5c4..e3d9176b816 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 7abf6d7c828..38b85a098c1 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 = '' |