summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author宋文武 <iyzsong@gmail.com>2016-06-11 09:57:11 +0800
committer宋文武 <iyzsong@gmail.com>2016-06-11 11:03:31 +0800
commit359f06aac8e6aaab96b68a0497224c00b622c193 (patch)
tree47f0066b9c9628d97059e604df750ddc82542411
parent436dd0463668361476a448d88f6e8653981a7346 (diff)
profiles: xdg-mime-database: Union the "share/mime/packages" directory.
* guix/profiles.scm (xdg-mime-database): Call 'union-build' for the "share/mime/packages" directory of inputs.
-rw-r--r--guix/profiles.scm18
1 files changed, 9 insertions, 9 deletions
diff --git a/guix/profiles.scm b/guix/profiles.scm
index ce8a11fbe5..3cb7b7a3ed 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -733,18 +733,18 @@ entries. It's used to query the MIME type of a given file."
(guix build union))
(let* ((datadir (string-append #$output "/share"))
(destdir (string-append datadir "/mime"))
- (mimedirs (filter file-exists?
- (map (cut string-append <>
- "/share/mime")
- '#$(manifest-inputs manifest))))
+ (pkgdirs (filter file-exists?
+ (map (cut string-append <>
+ "/share/mime/packages")
+ '#$(manifest-inputs manifest))))
(update-mime-database (string-append
#+shared-mime-info
"/bin/update-mime-database")))
- (mkdir-p datadir)
- (union-build destdir mimedirs
- #:log-port (%make-void-port "w"))
- (setenv "XDG_DATA_HOME" datadir)
- (zero? (system* update-mime-database destdir)))))
+ (mkdir-p destdir)
+ (union-build (string-append destdir "/packages") pkgdirs
+ #:log-port (%make-void-port "w"))
+ (setenv "XDG_DATA_HOME" datadir)
+ (zero? (system* update-mime-database destdir)))))
;; Don't run the hook when 'shared-mime-info' is referenced.
(if shared-mime-info