diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-01-23 18:01:16 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-01-23 23:49:24 +0100 |
| commit | ca79e42ea2a6becbb444bad35dbbad4e03bfad2c (patch) | |
| tree | e84d89f1c2ecff11812aef018afa9e5885a9d419 /guix/build/glib-or-gtk-build-system.scm | |
| parent | 7d8379a7679658acf9c15c4788881674d80a2488 (diff) | |
| download | gnu-guix-ca79e42ea2a6becbb444bad35dbbad4e03bfad2c.tar gnu-guix-ca79e42ea2a6becbb444bad35dbbad4e03bfad2c.tar.gz | |
build-system/glib-or-gtk: Add MIME directories to $XDG_DATA_DIRS.
Fixes an Evince regression introduced in commit 3d243e9.
* guix/build/glib-or-gtk-build-system.scm (data-directories): Check the
/mime sub-directory.
Diffstat (limited to 'guix/build/glib-or-gtk-build-system.scm')
| -rw-r--r-- | guix/build/glib-or-gtk-build-system.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/guix/build/glib-or-gtk-build-system.scm b/guix/build/glib-or-gtk-build-system.scm index a404a84f3f..92e91bf7a5 100644 --- a/guix/build/glib-or-gtk-build-system.scm +++ b/guix/build/glib-or-gtk-build-system.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Federico Beffa <beffa@fbengineering.ch> -;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -72,7 +72,7 @@ with all found directories." ;; http://www.freedesktop.org/wiki/DesktopThemeSpec ;; http://freedesktop.org/wiki/Specifications/sound-theme-spec ;; http://freedesktop.org/wiki/Specifications/icon-theme-spec -;; +;; ;; Currently desktop themes are not well supported and do not honor ;; XDG_DATA_DIRS. One example is evince which only looks for desktop themes ;; in $HOME/.themes (for backward compatibility) and in XDG_DATA_HOME (which @@ -92,7 +92,8 @@ in INPUTS. Return a list with all found directories." (subdirectory-exists? datadir "/themes") (subdirectory-exists? datadir "/cursors") (subdirectory-exists? datadir "/wallpapers") - (subdirectory-exists? datadir "/icons")) + (subdirectory-exists? datadir "/icons") + (subdirectory-exists? datadir "/mime")) ;shared-mime-info (not (directory-included? datadir previous))) (cons datadir previous) previous))) |