[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/18: gnu: lxpanel: Build with GTK 3, use gexps and new style inputs.
From: |
guix-commits |
Subject: |
04/18: gnu: lxpanel: Build with GTK 3, use gexps and new style inputs. |
Date: |
Wed, 17 Aug 2022 22:57:54 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit ee0c9557c19649d518cfc67d6753186e2928f2b4
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Aug 17 21:53:19 2022 -0400
gnu: lxpanel: Build with GTK 3, use gexps and new style inputs.
* gnu/packages/lxde.scm (lxpanel)[source]: Use mirror URI.
[configure-flags]: Add --enable-gtk3.
[phases]{wrap}: Use search-input-file and this-package-input.
[inputs]: Use new style inputs. Replace gtk+-2 with gtk+. Remove
libindicator comment; it seems to expect an old incompatible version.
Sort in lexical order. Add bash-minimal.
[native-inputs]: Use new style inputs. Sort in lexical order.
[propagated-inputs]: Likewise.
---
gnu/packages/lxde.scm | 61 +++++++++++++++++++++++++++++----------------------
1 file changed, 35 insertions(+), 26 deletions(-)
diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm
index a0879dd229..ccb8efd671 100644
--- a/gnu/packages/lxde.scm
+++ b/gnu/packages/lxde.scm
@@ -10,6 +10,7 @@
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Meiyo Peng <meiyo@riseup.net>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
+;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -573,39 +574,47 @@ in LXDE.")
(source
(origin
(method url-fetch)
- (uri (string-append "https://downloads.sourceforge.net/lxde/"
- "lxpanel-" version ".tar.xz"))
+ (uri (string-append "mirror://sourceforge/lxde/"
+ "LXPanel%20%28desktop%20panel%29/"
+ "LXPanel%200.10.x/lxpanel-"
+ version ".tar.xz"))
(sha256
(base32 "1s0y8jjkw6qz0r8l90618b8xly0c8g906kah7b162sz3sxbqyc8y"))))
(build-system gnu-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'install 'wrap
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (menu (assoc-ref inputs "lxmenu-data")))
- (wrap-program (string-append out "/bin/lxpanel")
- `("XDG_DATA_DIRS" ":" prefix
- (,(string-append menu "/share"))))
- #t))))))
+ (list
+ #:configure-flags #~(list "--enable-gtk3")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'wrap
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (wrap-program (search-input-file outputs "bin/lxpanel")
+ `("XDG_DATA_DIRS" ":" prefix
+ (,(string-append #$(this-package-input "lxmenu-data")
+ "/share")))))))))
(inputs
- ;; TODO: libindicator-0.3.0
- `(("curl" ,curl)
- ("gtk+-2" ,gtk+-2)
- ("alsa-lib" ,alsa-lib)
- ("libwnck-2" ,libwnck-2)
- ("keybinder" ,keybinder)
- ("libxmu" ,libxmu)
- ("libxpm" ,libxpm)
- ("libxml2" ,libxml2)
- ("cairo" ,cairo)
- ("libx11" ,libx11)
- ("wireless-tools" ,wireless-tools)))
+ (list alsa-lib
+ bash-minimal ;for wrap-program
+ cairo
+ curl
+ gtk+
+ keybinder
+ libindicator
+ libwnck
+ libx11
+ libxml2
+ libxmu
+ libxpm
+ wireless-tools))
(native-inputs
- (list pkg-config intltool docbook-xml gettext-minimal))
+ (list docbook-xml
+ gettext-minimal
+ intltool
+ pkg-config))
(propagated-inputs
- (list lxmenu-data libfm menu-cache))
+ (list libfm
+ lxmenu-data
+ menu-cache))
(synopsis "X11 Desktop panel for LXDE")
(description
"Lxpanel provides an X11 desktop panel for LXDE.")
- branch master updated (6c2e14a43a -> 741c8efd6a), guix-commits, 2022/08/17
- 17/18: gnu: lxinput: Use a mirror:// URI., guix-commits, 2022/08/17
- 01/18: gnu: openjdk: Add a variable tracking the latest openjdk package., guix-commits, 2022/08/17
- 02/18: gnu: libfm: Build with GTK 3., guix-commits, 2022/08/17
- 06/18: gnu: viewnior: Use new style inputs and fix indentation., guix-commits, 2022/08/17
- 04/18: gnu: lxpanel: Build with GTK 3, use gexps and new style inputs.,
guix-commits <=
- 05/18: gnu: gpicview: Build with GTK 3., guix-commits, 2022/08/17
- 16/18: gnu: lxde-common: Use a mirror:// URI., guix-commits, 2022/08/17
- 13/18: gnu: Update LXDE packages home page., guix-commits, 2022/08/17
- 03/18: gnu: pcmanfm: Build with GTK 3., guix-commits, 2022/08/17
- 09/18: gnu: lxrandr: Build with GTK 3., guix-commits, 2022/08/17
- 11/18: gnu: lxinput: Build with GTK 3., guix-commits, 2022/08/17
- 12/18: gnu: lxterminal: Build with GTK 3., guix-commits, 2022/08/17
- 08/18: gnu: lxsession: Build with GTK 3., guix-commits, 2022/08/17
- 14/18: gnu: lxmenu-data: Use a mirror:// URI., guix-commits, 2022/08/17
- 15/18: gnu: lxde-icon-theme: Use a mirror:// URI., guix-commits, 2022/08/17