summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2015-02-05 01:25:12 -0500
committerMark H Weaver <mhw@netris.org>2015-02-05 01:30:16 -0500
commit800d8d406186b22ea503896c2d522ff184620a7a (patch)
tree865cfd5f6c6e26f8e51ed0951701233ee16314ef /gnu
parentb7d0c494f4c7a74c9bd339226339e23377d7c068 (diff)
downloadpatches-800d8d406186b22ea503896c2d522ff184620a7a.tar
patches-800d8d406186b22ea503896c2d522ff184620a7a.tar.gz
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.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/wicd.scm37
1 files changed, 23 insertions, 14 deletions
diff --git a/gnu/packages/wicd.scm b/gnu/packages/wicd.scm
index c66e4b0ed3..9f56d586a6 100644
--- a/gnu/packages/wicd.scm
+++ b/gnu/packages/wicd.scm
@@ -25,6 +25,7 @@
#: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 @@
("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 @@
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 @@
"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")