diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-09-17 18:01:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-17 18:01:14 +0000 |
| commit | a21275cdae89ae5ac180f71baf1c908cb427b609 (patch) | |
| tree | 496c38ea546e331aa0c7b658f33cd633580110a8 /pkgs/desktops/plasma-5 | |
| parent | 183cd6b09fdb5b9e9517b960e31ce2e4f42af0f7 (diff) | |
| parent | 3f6e7482ee37808794c71625de8bed9317691e30 (diff) | |
| download | nixpkgs-a21275cdae89ae5ac180f71baf1c908cb427b609.tar nixpkgs-a21275cdae89ae5ac180f71baf1c908cb427b609.tar.gz nixpkgs-a21275cdae89ae5ac180f71baf1c908cb427b609.tar.bz2 nixpkgs-a21275cdae89ae5ac180f71baf1c908cb427b609.tar.lz nixpkgs-a21275cdae89ae5ac180f71baf1c908cb427b609.tar.xz nixpkgs-a21275cdae89ae5ac180f71baf1c908cb427b609.tar.zst nixpkgs-a21275cdae89ae5ac180f71baf1c908cb427b609.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops/plasma-5')
| -rw-r--r-- | pkgs/desktops/plasma-5/plasma-desktop/default.nix | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index d8ca0ddfdec..37134f240dc 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -40,14 +40,8 @@ mkDerivation { sed '1i#include <cmath>' -i kcms/touchpad/backends/x11/synapticstouchpad.cpp ''; CXXFLAGS = [ - "-I${lib.getDev xorgserver}/include/xorg" - "-I${lib.getDev xf86inputsynaptics}/include/xorg" ''-DNIXPKGS_HWCLOCK=\"${lib.getBin util-linux}/sbin/hwclock\"'' ]; - cmakeFlags = [ - "-DEvdev_INCLUDE_DIRS=${lib.getDev xf86inputevdev}/include/xorg" - "-DXORGLIBINPUT_INCLUDE_DIRS=${lib.getDev xf86inputlibinput}/include/xorg" - ]; postInstall = '' # Display ~/Desktop contents on the desktop by default. sed -i "''${!outputBin}/share/plasma/shells/org.kde.plasma.desktop/contents/defaults" \ |