[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: profiles: xdg-mime-database: Union the "share/mime/packages" dire
From: |
??? |
Subject: |
01/02: profiles: xdg-mime-database: Union the "share/mime/packages" directory. |
Date: |
Sat, 11 Jun 2016 03:05:52 +0000 (UTC) |
iyzsong pushed a commit to branch master
in repository guix.
commit 359f06aac8e6aaab96b68a0497224c00b622c193
Author: 宋文武 <address@hidden>
Date: Sat Jun 11 09:57:11 2016 +0800
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.
---
guix/profiles.scm | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/guix/profiles.scm b/guix/profiles.scm
index ce8a11f..3cb7b7a 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