diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-05-26 15:43:31 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-18 08:44:45 -0500 |
| commit | a4be1a68f8d45d87e9dec36dc81070ed1f2b722e (patch) | |
| tree | 24721dc60b82c96f5e117f4682902f28d287a081 /pkgs/desktops/plasma-5 | |
| parent | 86dac81a706fa7015522eb6b3da8f951200f4b21 (diff) | |
| download | nixlib-a4be1a68f8d45d87e9dec36dc81070ed1f2b722e.tar nixlib-a4be1a68f8d45d87e9dec36dc81070ed1f2b722e.tar.gz nixlib-a4be1a68f8d45d87e9dec36dc81070ed1f2b722e.tar.bz2 nixlib-a4be1a68f8d45d87e9dec36dc81070ed1f2b722e.tar.lz nixlib-a4be1a68f8d45d87e9dec36dc81070ed1f2b722e.tar.xz nixlib-a4be1a68f8d45d87e9dec36dc81070ed1f2b722e.tar.zst nixlib-a4be1a68f8d45d87e9dec36dc81070ed1f2b722e.zip | |
plasma-desktop: pass path to hwclock through preprocessor macro
Diffstat (limited to 'pkgs/desktops/plasma-5')
| -rw-r--r-- | pkgs/desktops/plasma-5/plasma-desktop/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index a1ccaea6ea31..377bc4cdd142 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -32,7 +32,10 @@ mkDerivation rec { sed '1i#include <cmath>' -i kcms/touchpad/src/backends/x11/synapticstouchpad.cpp ''; - NIX_CFLAGS_COMPILE = [ "-I${xorgserver.dev}/include/xorg" ]; + NIX_CFLAGS_COMPILE = [ + "-I${lib.getDev xorgserver}/include/xorg" + ''-DNIXPKGS_HWCLOCK="${lib.getBin utillinux}/sbin/hwclock"'' + ]; cmakeFlags = [ "-DEvdev_INCLUDE_DIRS=${xf86inputevdev.dev}/include/xorg" "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics.dev}/include/xorg" diff --git a/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch b/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch index 5623de84668f..a46212af10fb 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch +++ b/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch @@ -18,7 +18,7 @@ Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp void ClockHelper::toHwclock() { - QString hwclock = KStandardDirs::findExe(QStringLiteral("hwclock"), exePath); -+ QString hwclock = "@hwclock@"; ++ QString hwclock = QLatin1String(NIXPKGS_HWCLOCK); if (!hwclock.isEmpty()) { KProcess::execute(hwclock, QStringList() << QStringLiteral("--systohc")); } |