[evince/wip/hadess/app-provided-pixbuf-loader: 2/2] flatpak: Update Flatpak for app-provided gdk-pixbuf loader

[Bastien Nocera <hadess src gnome org>]

commit 961e9bd096bf6fe482bbdd0cb6e7c6d2ee824fb0
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Feb 28 14:55:31 2019 +0100

    flatpak: Update Flatpak for app-provided gdk-pixbuf loader
    
    This simplifies the code slightly.

 build-aux/flatpak/org.gnome.Evince.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Evince.json b/build-aux/flatpak/org.gnome.Evince.json
index 080bada3..6f1185e3 100644
--- a/build-aux/flatpak/org.gnome.Evince.json
+++ b/build-aux/flatpak/org.gnome.Evince.json
@@ -19,7 +19,6 @@
         "--filesystem=~/.config/dconf:ro",
         "--talk-name=ca.desrt.dconf",
         "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
-        "--env=GDK_PIXBUF_MODULE_FILE=/app/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache",
         "--talk-name=org.gtk.vfs",
         "--talk-name=org.gtk.vfs.*",
         "--talk-name=org.gnome.SessionManager",
@@ -66,6 +65,9 @@
         {
             "name": "webp-pixbuf-loader",
             "buildsystem": "cmake-ninja",
+            "env": {
+                "GDK_PIXBUF_MODULEDIR": "/app/lib/evince/gdk-pixbuf/2.10.0/"
+            },
             "sources": [
                 {
                     "type": "git",
@@ -74,8 +76,7 @@
                 }
             ],
             "post-install": [
-                "GDK_PIXBUF_MODULEDIR=/app/lib/gdk-pixbuf-2.0/2.10.0/loaders/ gdk-pixbuf-query-loaders > 
loaders.cache",
-                "cat /usr/lib/*/gdk-pixbuf-2.0/2.10.0/loaders.cache loaders.cache > 
/app/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+                "gdk-pixbuf-query-loaders > $GDK_PIXBUF_MODULEDIR/loaders.cache"
             ]
         },
         {