guix-commits
[Top][All Lists]
Advanced

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

branch master updated: gnu: mate-polkit-for-xfce: Break circular top-lev


From: guix-commits
Subject: branch master updated: gnu: mate-polkit-for-xfce: Break circular top-level references.
Date: Mon, 06 Mar 2023 18:03:22 -0500

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

civodul pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 0d96387527 gnu: mate-polkit-for-xfce: Break circular top-level 
references.
0d96387527 is described below

commit 0d963875278d585eb86bc87127efa20a8d627595
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Mar 6 23:52:45 2023 +0100

    gnu: mate-polkit-for-xfce: Break circular top-level references.
    
    Fixes <https://issues.guix.gnu.org/61911>.
    Reported by Maxime Devos <maximedevos@telenet.be>.
    
    * gnu/packages/xfce.scm (mate-polkit-for-xfce): Move to...
    * gnu/packages/mate.scm (mate-polkit-for-xfce): ... here.
---
 gnu/packages/mate.scm | 17 +++++++++++++++++
 gnu/packages/xfce.scm | 17 -----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index ce62366985..2f38946fe1 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -1470,6 +1470,23 @@ MATE Desktop to monitor your system resources and 
usage.")
 used to bring up authentication dialogs.")
     (license license:lgpl2.1)))
 
+(define-public mate-polkit-for-xfce
+  (package/inherit mate-polkit
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'patch-desktop
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((common (string-append
+                             (assoc-ref outputs "out") "/etc/xdg/autostart/"
+                             "polkit-mate-authentication-agent-"))
+                    (old (string-append common "1.desktop"))
+                    (new (string-append common "for-xfce-1.desktop")))
+               (substitute* old (("MATE;") "XFCE;"))
+               ;; To avoid a conflict if both MATE and XFCE are installed.
+               (rename-file old new)))))))
+    (properties `((hidden? . #t)))))
+
 (define-public mate
   (package
     (name "mate")
diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 716c32d1bb..5223c3a38c 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1152,23 +1152,6 @@ search feature works like Xfce's app finder and makes it 
convenient to search
 for and start applications.")
     (license gpl2+)))
 
-(define-public mate-polkit-for-xfce
-  (package/inherit mate-polkit
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'patch-desktop
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((common (string-append
-                             (assoc-ref outputs "out") "/etc/xdg/autostart/"
-                             "polkit-mate-authentication-agent-"))
-                    (old (string-append common "1.desktop"))
-                    (new (string-append common "for-xfce-1.desktop")))
-               (substitute* old (("MATE;") "XFCE;"))
-               ;; To avoid a conflict if both MATE and XFCE are installed.
-               (rename-file old new)))))))
-    (properties `((hidden? . #t)))))
-
 (define-public xfce
   (package
     (name "xfce")



reply via email to

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