branch master updated: Revert "gnu: lxqt-admin: Fix path for timezone file."

[guix-commits]

This is an automated email from the git hooks/post-receive script.

lfam pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 040d35f088 Revert "gnu: lxqt-admin: Fix path for timezone file."
040d35f088 is described below

commit 040d35f088e0f1c856f3f5a9b6bf889b17bd68b3
Author: Leo Famulari <leo@famulari.name>
AuthorDate: Fri Apr 21 14:34:23 2023 -0400

    Revert "gnu: lxqt-admin: Fix path for timezone file."
    
    The timezone database should not be depended on by packages, but rather 
found at
    runtime in the environment. Otherwise, this package will eventually report 
the
    incorrect time, because time zones change regularly.
    
    This reverts commit 99c1c7a30c59c3514a4ced6e0cad0e5c2860331d.
---
 gnu/packages/lxqt.scm | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 4ebe8071f7..04373de961 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -39,7 +39,6 @@
   #:use-module (guix build-system trivial)
   #:use-module (gnu packages)
   #:use-module (gnu packages admin)
-  #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages compton)
@@ -321,8 +320,7 @@ LXQt and the system it's running on.")
            libqtxdg
            polkit-qt
            qtsvg-5
-           qtx11extras
-           tzdata))
+           qtx11extras))
     (native-inputs
      (list lxqt-build-tools qttools-5))
     (arguments
@@ -330,14 +328,12 @@ LXQt and the system it's running on.")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-source
-           (lambda* (#:key inputs #:allow-other-keys)
+           (lambda _
              (substitute* '("lxqt-admin-user/CMakeLists.txt"
                             "lxqt-admin-time/CMakeLists.txt")
                (("DESTINATION \"\\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}")
                 "DESTINATION \"share/polkit-1/actions"))
-             (substitute* '("lxqt-admin-time/timeadmindialog.cpp")
-               (("/usr/share/zoneinfo/zone.tab")
-                (search-input-file inputs "share/zoneinfo/zone.tab"))))))))
+             #t)))))
     (home-page "https://lxqt-project.org";)
     (synopsis "LXQt system administration tool")
     (description "lxqt-admin is providing two GUI tools to adjust settings of