about summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2016-06-23 09:25:10 +0200
committerVladimír Čunát <vcunat@gmail.com>2016-06-23 09:25:10 +0200
commitaa9a04883e34f6a7b89846e87654577d5b218f46 (patch)
tree5bc2d586532b76c0248a9e3280ec7e333ef6d893 /pkgs/desktops
parent21f9180d49d1d911668620f3d8897c1e1352672a (diff)
downloadnixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar
nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.gz
nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.bz2
nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.lz
nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.xz
nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.zst
nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.zip
Revert "Merge branch 'staging'" due to glibc
The main output started to retain dependency on bootstrap-tools; see
https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096

This reverts commit c05d8295988697adbb920a7b4a999ae3670c5504, reversing
changes made to f073df60d60444c30c49cb26d6b187a4100b41fe.
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix3
1 files changed, 0 insertions, 3 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 2a1d95806c10..618e7387e62c 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,9 +34,6 @@ 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"