summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2016-08-17 23:21:00 -0400
committerLeo Famulari <leo@famulari.name>2016-08-17 23:35:22 -0400
commit015ee84aac888b3900fa0ee54a1b7e55c083e7d3 (patch)
tree2ef7a51321dff53e479bc6d11f3785e1c65c07f0 /guix
parenta3d6e1f432ad5f9cde8bee670b28646e05c4cb19 (diff)
parent79f9d5d5dc97e492e0583e039a2699aa17f4eb11 (diff)
Merge branch 'master' into core-updates
Diffstat (limited to 'guix')
-rw-r--r--guix/build-system/ant.scm2
-rw-r--r--guix/profiles.scm14
2 files changed, 10 insertions, 6 deletions
diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm
index f333aa5ae8..550f92bc7f 100644
--- a/guix/build-system/ant.scm
+++ b/guix/build-system/ant.scm
@@ -103,7 +103,7 @@
(outputs '("out"))
(search-paths '())
(system (%current-system))
- (guile #f)p
+ (guile #f)
(imported-modules %ant-build-system-modules)
(modules '((guix build ant-build-system)
(guix build utils))))
diff --git a/guix/profiles.scm b/guix/profiles.scm
index db807a8136..cd448e3f25 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -723,9 +723,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))
@@ -738,7 +741,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")))
@@ -748,8 +752,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)