guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/02: gnu: pcmanfm-qt: Remove obsolete workaround.


From: guix-commits
Subject: 01/02: gnu: pcmanfm-qt: Remove obsolete workaround.
Date: Sun, 12 Apr 2020 11:17:11 -0400 (EDT)

mbakke pushed a commit to branch core-updates
in repository guix.

commit 2d1f79229cb28505c3aab6dc0d6d7bab864bd406
Author: Marius Bakke <address@hidden>
AuthorDate: Sat Apr 11 17:56:06 2020 +0200

    gnu: pcmanfm-qt: Remove obsolete workaround.
    
    * gnu/packages/lxqt.scm (pcmanfm-qt)[inputs]: Remove GLIB:BIN.
    [arguments]: Remove phase 'wrap-glib'.
---
 gnu/packages/lxqt.scm | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index a440491..a5a15e5 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -994,8 +994,7 @@ components to build desktop file managers which belongs to 
LXDE.")
         (base32 "0x3c25inlxll965xszx37mnl5gp3smm2h7x04f67z0qlh3vsbrjq"))))
     (build-system cmake-build-system)
     (inputs
-     `(("glib:bin" ,glib "bin")
-       ("libfm-qt" ,libfm-qt)
+     `(("libfm-qt" ,libfm-qt)
        ("qtbase" ,qtbase)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
@@ -1011,17 +1010,7 @@ components to build desktop file managers which belongs 
to LXDE.")
              (substitute* '("autostart/CMakeLists.txt")
                (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
                 "DESTINATION \"etc/xdg"))
-             #t))
-         (add-after 'install 'wrap-glib
-           (lambda* (#:key outputs inputs #:allow-other-keys)
-             (let* ((out  (assoc-ref outputs "out"))
-                    (glib (assoc-ref inputs "glib:bin"))
-                    (gio-exe-path (string-append glib 
"/bin/gio-launch-desktop")))
-               (if (file-exists? gio-exe-path)
-                 (wrap-program (string-append out "/bin/pcmanfm-qt")
-                   `("GIO_LAUNCH_DESKTOP" = (,gio-exe-path)))
-                 (error "could not find gio-launch-desktop"))
-               #t))))))
+             #t)))))
     (home-page "https://lxqt.org/";)
     (synopsis "File manager and desktop icon manager")
     (description "PCManFM-Qt is the Qt port of PCManFM, the file manager of



reply via email to

[Prev in Thread] Current Thread [Next in Thread]