diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2023-03-06 23:52:45 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-03-07 00:02:00 +0100 |
| commit | 0d963875278d585eb86bc87127efa20a8d627595 (patch) | |
| tree | 459adf7d6547f8e94d337796618acd1b8e4bb07d | |
| parent | f88a0bb0db7a3a0e47c5377951b6de691c386775 (diff) | |
| download | guix-0d963875278d585eb86bc87127efa20a8d627595.tar.gz | |
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.
| -rw-r--r-- | gnu/packages/mate.scm | 17 | ||||
| -rw-r--r-- | 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") |