From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Subject: [PATCH] profiles: xdg-mime-database: Run the hook when have GLib based applications. Date: Thu, 11 Aug 2016 21:21:18 +0800 Message-ID: <20160811132118.30771-1-iyzsong@gmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55749) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bXpvT-0003Xx-Qw for guix-devel@gnu.org; Thu, 11 Aug 2016 09:21:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bXpvP-0001D5-KY for guix-devel@gnu.org; Thu, 11 Aug 2016 09:21:34 -0400 Received: from mail.openmailbox.org ([62.4.1.34]:33446) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bXpvP-0001Ca-Dx for guix-devel@gnu.org; Thu, 11 Aug 2016 09:21:31 -0400 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org Cc: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= * guix/profiles.scm (xdg-mime-database): Run the hook when GLIB is referenced by the manifest. Add SHARED-MIME-INFO to the mime packages of `update-mime-database'. --- guix/profiles.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/guix/profiles.scm b/guix/profiles.scm index 9c2dbba..169c700 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -732,9 +732,12 @@ MIME type." (define (xdg-mime-database manifest) "Return a derivation that builds the @file{mime.cache} database from manifest entries. It's used to query the MIME type of a given file." - (mlet %store-monad ((shared-mime-info + (define shared-mime-info ; lazy reference + (module-ref (resolve-interface '(gnu packages gnome)) 'shared-mime-info)) + + (mlet %store-monad ((glib (manifest-lookup-package - manifest "shared-mime-info"))) + manifest "glib"))) (define build (with-imported-modules '((guix build utils) (guix build union)) @@ -747,7 +750,8 @@ entries. It's used to query the MIME type of a given file." (pkgdirs (filter file-exists? (map (cut string-append <> "/share/mime/packages") - '#$(manifest-inputs manifest)))) + (cons #+shared-mime-info + '#$(manifest-inputs manifest))))) (update-mime-database (string-append #+shared-mime-info "/bin/update-mime-database"))) @@ -757,8 +761,8 @@ entries. It's used to query the MIME type of a given file." (setenv "XDG_DATA_HOME" datadir) (exit (zero? (system* update-mime-database destdir))))))) - ;; Don't run the hook when 'shared-mime-info' is referenced. - (if shared-mime-info + ;; Don't run the hook when there are no GLib based applications. + (if glib (gexp->derivation "xdg-mime-database" build #:local-build? #t #:substitutable? #f) -- 2.8.4