me/guix
Archived
1
0
Fork 0
Code Activity

profiles: gtk-icon-themes: Use 'gtk-update-icon-cache' from 'gtk+:bin'.

Browse source 
This is a followup to commit 7b808d7.

* guix/profiles.scm (gtk-icon-themes): Use 'gtk-update-icon-cache' from
the "bin" output of gtk+ package.
This commit is contained in:
宋文武 2016-08-06 18:28:57 +08:00
parent 7b808d76d6
commit d1fb4af6b8
No known key found for this signature in database
GPG key ID: 26525665AE727D37
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
guix/profiles.scm
View file

@ -642,7 +642,18 @@ MANIFEST. Single-file bundles are required by programs such as Git and Lynx."
(define (gtk-icon-themes manifest) (define (gtk-icon-themes manifest)
"Return a derivation that unions all icon themes from manifest entries and "Return a derivation that unions all icon themes from manifest entries and
creates the GTK+ 'icon-theme.cache' file for each theme." creates the GTK+ 'icon-theme.cache' file for each theme."
(mlet %store-monad ((gtk+ (manifest-lookup-package manifest "gtk+"))) (define gtk+ ; lazy reference
(module-ref (resolve-interface '(gnu packages gtk)) 'gtk+))
(mlet %store-monad ((%gtk+ (manifest-lookup-package manifest "gtk+"))
;; XXX: Can't use gtk-update-icon-cache corresponding
;; to the gtk+ referenced by 'manifest'. Because
;; '%gtk+' can be either a package or store path, and
;; there's no way to get the "bin" output for the later.
(gtk-update-icon-cache
-> #~(string-append #+gtk+:bin
"/bin/gtk-update-icon-cache")))
(define build (define build
(with-imported-modules '((guix build utils) (with-imported-modules '((guix build utils)
(guix build union) (guix build union)
@ -659,9 +670,7 @@ creates the GTK+ 'icon-theme.cache' file for each theme."
(let* ((destdir (string-append #$output "/share/icons")) (let* ((destdir (string-append #$output "/share/icons"))
(icondirs (filter file-exists? (icondirs (filter file-exists?
(map (cut string-append <> "/share/icons") (map (cut string-append <> "/share/icons")
'#$(manifest-inputs manifest)))) '#$(manifest-inputs manifest)))))
(update-icon-cache (string-append
#+gtk+ "/bin/gtk-update-icon-cache")))
;; Union all the icons. ;; Union all the icons.
(mkdir-p (string-append #$output "/share")) (mkdir-p (string-append #$output "/share"))
@ -676,11 +685,11 @@ creates the GTK+ 'icon-theme.cache' file for each theme."
;; "abiword_48.png". Ignore these. ;; "abiword_48.png". Ignore these.
(when (file-is-directory? dir) (when (file-is-directory? dir)
(ensure-writable-directory dir) (ensure-writable-directory dir)
(system* update-icon-cache "-t" dir "--quiet")))) (system* #+gtk-update-icon-cache "-t" dir "--quiet"))))
(scandir destdir (negate (cut member <> '("." ".."))))))))) (scandir destdir (negate (cut member <> '("." "..")))))))))
;; Don't run the hook when there's nothing to do. ;; Don't run the hook when there's nothing to do.
(if gtk+ (if %gtk+
(gexp->derivation "gtk-icon-themes" build (gexp->derivation "gtk-icon-themes" build
#:local-build? #t #:local-build? #t
#:substitutable? #f) #:substitutable? #f)