mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 15:36:20 -05:00
gnu: wicd: Allow wicd-gtk to find its icons.
* gnu/packages/wicd.scm (wicd)[inputs]: Add hicolor-icon-theme. [arguments]: Install icons in $out/share/icons. Install a copy of 'index.theme' from 'hicolor-icon-theme' into $out/share/icons/hicolor.
This commit is contained in:
parent
b7d0c494f4
commit
800d8d4061
1 changed files with 23 additions and 14 deletions
|
@ -25,6 +25,7 @@ (define-module (gnu packages wicd)
|
|||
#:use-module (guix utils)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages admin)
|
||||
|
@ -54,7 +55,8 @@ (define-public wicd
|
|||
("wpa-supplicant" ,wpa-supplicant)
|
||||
("net-tools" ,net-tools)
|
||||
("isc-dhcp" ,isc-dhcp)
|
||||
("iproute" ,iproute)))
|
||||
("iproute" ,iproute)
|
||||
("hicolor-icon-theme" ,hicolor-icon-theme)))
|
||||
(arguments
|
||||
`(#:python ,python-2
|
||||
#:tests? #f ; test suite requires networking
|
||||
|
@ -140,7 +142,7 @@ (define (which* cmd)
|
|||
out "/share/gnome-shell-extensions")
|
||||
(string-append "--icons=" out "/share/icons/hicolor")
|
||||
(string-append "--pixmaps=" out "/share/pixmaps")
|
||||
(string-append "--images=" out "/share/wicd/icons")
|
||||
(string-append "--images=" out "/share/icons")
|
||||
(string-append "--dbus=" out "/etc/dbus-1/system.d")
|
||||
(string-append "--dbus-service="
|
||||
out "/share/dbus-1/system-services")
|
||||
|
@ -157,18 +159,25 @@ (define (which* cmd)
|
|||
"python setup.py" "configure" params)
|
||||
(zero? (apply system* "python" "setup.py" "configure" params)))))
|
||||
(alist-cons-after
|
||||
'install 'install-dhclient.conf.template.default
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; wicd's installer tries to put dhclient.conf.template.default
|
||||
;; in /etc/wicd/other, which is not available in the build
|
||||
;; environment, so here we install it manually in the output
|
||||
;; directory.
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(dest-dir (string-append out "/etc/wicd"))
|
||||
(name "dhclient.conf.template.default"))
|
||||
(mkdir-p dest-dir)
|
||||
(copy-file (string-append "other/" name)
|
||||
(string-append dest-dir "/" name))
|
||||
'install 'post-install
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
;; wicd's installer tries to put dhclient.conf.template.default
|
||||
;; in /etc/wicd/other, which is not available in the build
|
||||
;; environment, so here we install it manually in the output
|
||||
;; directory.
|
||||
(let ((dest-dir (string-append out "/etc/wicd"))
|
||||
(name "dhclient.conf.template.default"))
|
||||
(mkdir-p dest-dir)
|
||||
(copy-file (string-append "other/" name)
|
||||
(string-append dest-dir "/" name)))
|
||||
|
||||
;; Copy index.theme from hicolor-icon-theme. This is needed to
|
||||
;; allow wicd-gtk to find its icons.
|
||||
(let ((hicolor (assoc-ref inputs "hicolor-icon-theme"))
|
||||
(name "/share/icons/hicolor/index.theme"))
|
||||
(copy-file (string-append hicolor name)
|
||||
(string-append out name)))
|
||||
#t))
|
||||
%standard-phases))))
|
||||
(synopsis "Network connection manager")
|
||||
|
|
Loading…
Reference in a new issue