diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-29 07:47:04 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-29 07:47:04 +0200 |
| commit | 3afa2460386b1472128e302d1db13dba54e68e12 (patch) | |
| tree | 1bc0a79319449f29cbd5a1715c0135db1bed9337 /pkgs/desktops | |
| parent | d9036a02b5c5ef31e18e913ce7e2eb56999d311e (diff) | |
| parent | f4792cdc0cffc0d1843f5d8bb3e458546646f67c (diff) | |
| download | nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.gz nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.bz2 nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.lz nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.xz nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.zst nixlib-3afa2460386b1472128e302d1db13dba54e68e12.zip | |
Merge branch 'staging'
This includes a security update of expat.
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix | 3 |
1 files changed, 3 insertions, 0 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 618e7387e62c..2a1d95806c10 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,6 +34,9 @@ plasmaPackage rec { }) ./0003-tzdir.patch ]; + postPatch = '' + sed '1i#include <cmath>' -i kcms/touchpad/src/backends/x11/synapticstouchpad.cpp + ''; NIX_CFLAGS_COMPILE = [ "-I${xorgserver.dev}/include/xorg" ]; cmakeFlags = [ "-DEvdev_INCLUDE_DIRS=${xf86inputevdev.dev}/include/xorg" |