nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2015-01-23 18:01:16 +01:00
parent 7d8379a767
commit ca79e42ea2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
guix/build/glib-or-gtk-build-system.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Federico Beffa <beffa@fbengineering.ch> ;;; 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. ;;; This file is part of GNU Guix.
;;; ;;;
@ -72,7 +72,7 @@ with all found directories."
;; http://www.freedesktop.org/wiki/DesktopThemeSpec ;; http://www.freedesktop.org/wiki/DesktopThemeSpec
;; http://freedesktop.org/wiki/Specifications/sound-theme-spec ;; http://freedesktop.org/wiki/Specifications/sound-theme-spec
;; http://freedesktop.org/wiki/Specifications/icon-theme-spec ;; http://freedesktop.org/wiki/Specifications/icon-theme-spec
;; ;;
;; Currently desktop themes are not well supported and do not honor ;; Currently desktop themes are not well supported and do not honor
;; XDG_DATA_DIRS. One example is evince which only looks for desktop themes ;; 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 ;; 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 "/themes")
(subdirectory-exists? datadir "/cursors") (subdirectory-exists? datadir "/cursors")
(subdirectory-exists? datadir "/wallpapers") (subdirectory-exists? datadir "/wallpapers")
(subdirectory-exists? datadir "/icons")) (subdirectory-exists? datadir "/icons")
(subdirectory-exists? datadir "/mime")) ;shared-mime-info
(not (directory-included? datadir previous))) (not (directory-included? datadir previous)))
(cons datadir previous) (cons datadir previous)
previous))) previous)))