alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #137899 from Artturin/mousekcm

Browse source
This commit is contained in:
Artturi 2021-09-18 01:24:40 +03:00 committed by GitHub
parent f3f5bbffb9 4467663aaa
commit 4820e9627f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/desktops/plasma-5/plasma-desktop/default.nix
View file

@ -1,5 +1,5 @@
{
mkDerivation, lib,
mkDerivation, lib, fetchpatch,
extra-cmake-modules, kdoctools,
boost, fontconfig, ibus, libXcursor, libXft, libcanberra_kde, libpulseaudio,
@ -21,7 +21,8 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft xorgserver
libxkbfile phonon xf86inputevdev xf86inputsynaptics xinput xkeyboard_config
libxkbfile phonon xf86inputlibinput xf86inputevdev xf86inputsynaptics xinput
xkeyboard_config
accounts-qt qtdeclarative qtquickcontrols qtquickcontrols2 qtsvg qtx11extras
@ -35,10 +36,12 @@ mkDerivation {
patches = [
./hwclock-path.patch
./tzdir.patch
# https://invent.kde.org/plasma/plasma-desktop/-/merge_requests/563
(fetchpatch {
url = "https://invent.kde.org/plasma/plasma-desktop/-/commit/8d9bf2032b8a2e5de75edf5713c42866f5b80649.patch";
sha256 = "sha256-2jqqFjBljbhf7I+fTsIvuFs3Ic662KTKRnbcSm5Jing=";
})
];
postPatch = ''
sed '1i#include <cmath>' -i kcms/touchpad/backends/x11/synapticstouchpad.cpp
'';
CXXFLAGS = [
''-DNIXPKGS_HWCLOCK=\"${lib.getBin util-linux}/sbin/hwclock\"''
];