nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Mark H Weaver 2015-02-05 01:25:12 -05:00
parent b7d0c494f4
commit 800d8d4061
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gnu/packages/wicd.scm
View File

@ -25,6 +25,7 @@
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages admin) #:use-module (gnu packages admin)
@ -54,7 +55,8 @@
("wpa-supplicant" ,wpa-supplicant) ("wpa-supplicant" ,wpa-supplicant)
("net-tools" ,net-tools) ("net-tools" ,net-tools)
("isc-dhcp" ,isc-dhcp) ("isc-dhcp" ,isc-dhcp)
("iproute" ,iproute))) ("iproute" ,iproute)
("hicolor-icon-theme" ,hicolor-icon-theme)))
(arguments (arguments
`(#:python ,python-2 `(#:python ,python-2
#:tests? #f ; test suite requires networking #:tests? #f ; test suite requires networking
@ -140,7 +142,7 @@
out "/share/gnome-shell-extensions") out "/share/gnome-shell-extensions")
(string-append "--icons=" out "/share/icons/hicolor") (string-append "--icons=" out "/share/icons/hicolor")
(string-append "--pixmaps=" out "/share/pixmaps") (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=" out "/etc/dbus-1/system.d")
(string-append "--dbus-service=" (string-append "--dbus-service="
out "/share/dbus-1/system-services") out "/share/dbus-1/system-services")
@ -157,18 +159,25 @@
"python setup.py" "configure" params) "python setup.py" "configure" params)
(zero? (apply system* "python" "setup.py" "configure" params))))) (zero? (apply system* "python" "setup.py" "configure" params)))))
(alist-cons-after (alist-cons-after
'install 'install-dhclient.conf.template.default 'install 'post-install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; wicd's installer tries to put dhclient.conf.template.default (let ((out (assoc-ref outputs "out")))
;; in /etc/wicd/other, which is not available in the build ;; wicd's installer tries to put dhclient.conf.template.default
;; environment, so here we install it manually in the output ;; in /etc/wicd/other, which is not available in the build
;; directory. ;; environment, so here we install it manually in the output
(let* ((out (assoc-ref outputs "out")) ;; directory.
(dest-dir (string-append out "/etc/wicd")) (let ((dest-dir (string-append out "/etc/wicd"))
(name "dhclient.conf.template.default")) (name "dhclient.conf.template.default"))
(mkdir-p dest-dir) (mkdir-p dest-dir)
(copy-file (string-append "other/" name) (copy-file (string-append "other/" name)
(string-append dest-dir "/" 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)) #t))
%standard-phases)))) %standard-phases))))
(synopsis "Network connection manager") (synopsis "Network connection manager")