Skip to content

Commit d05984b

Browse files
committed
lxqt-admin: fix ability to set timezone
* The timezone database file was not searched for in the correct location, giving an empty timezone list. Patch in the correct path. * The time utility believed it was built on a non-systemd-based distro, and so used an incorrect method to manipulate the timezone. Tell it that it should use systemd. The timezone list, and using the list to set the timezone, now work properly. Note that the taskbar clock will only update to the correct timezone on the next minute.
1 parent e6d927f commit d05984b

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

pkgs/desktops/lxqt/lxqt-admin/default.nix

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
qtsvg,
1212
qttools,
1313
qtwayland,
14+
tzdata,
1415
wrapQtAppsHook,
1516
gitUpdater,
1617
}:
@@ -42,12 +43,22 @@ stdenv.mkDerivation rec {
4243
qtwayland
4344
];
4445

46+
cmakeFlags = [
47+
# fake finding of libsystemd; used to check if we are a systemd-based
48+
# distro rather than actually being linked to
49+
"-DLIBSYSTEMD_FOUND=TRUE"
50+
];
51+
4552
postPatch = ''
4653
for f in lxqt-admin-{time,user}/CMakeLists.txt; do
4754
substituteInPlace $f --replace-fail \
4855
"\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}" \
4956
"$out/share/polkit-1/actions"
5057
done
58+
59+
# patch timezone database file location
60+
substituteInPlace lxqt-admin-time/timeadmindialog.cpp \
61+
--replace-fail "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"
5162
'';
5263

5364
passthru.updateScript = gitUpdater { };

0 commit comments

Comments
 (0)